mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-14 16:45:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move varargs information into CodeFlags

Browse source
This commit is contained in:
Noah 2020-04-02 09:02:18 -05:00
parent 170719180a
commit 61dc0181e0
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/compile.rs
View file

@ -14,7 +14,7 @@ use crate::symboltable::{
};
use itertools::Itertools;
use num_complex::Complex64;
use rustpython_bytecode::bytecode::{self, CallType, CodeObject, Instruction, Label, Varargs};
use rustpython_bytecode::bytecode::{self, CallType, CodeObject, Instruction, Label};
use rustpython_parser::{ast, parser};
type BasicOutputStream = PeepholeOptimizer<CodeObjectStream>;
@ -177,9 +177,9 @@ impl<O: OutputStream> Compiler<O> {
Default::default(),
0,
Vec::new(),
Varargs::None,
None,
Vec::new(),
Varargs::None,
None,
self.source_path.clone().unwrap(),
line_number,
obj_name,
@ -686,14 +686,29 @@ impl<O: OutputStream> Compiler<O> {
flags |= bytecode::CodeFlags::HAS_KW_ONLY_DEFAULTS;
}
let mut compile_varargs = |va: &ast::Varargs, flag| match va {
ast::Varargs::None => None,
ast::Varargs::Unnamed => {
flags |= flag;
None
}
ast::Varargs::Named(name) => {
flags |= flag;
Some(name.arg.clone())
}
};
let varargs_name = compile_varargs(&args.vararg, bytecode::CodeFlags::HAS_VARARGS);
let varkeywords_name = compile_varargs(&args.kwarg, bytecode::CodeFlags::HAS_VARKEYWORDS);
let line_number = self.get_source_line_number();
self.push_output(CodeObject::new(
flags,
args.posonlyargs_count,
args.args.iter().map(|a| a.arg.clone()).collect(),
compile_varargs(&args.vararg),
varargs_name,
args.kwonlyargs.iter().map(|a| a.arg.clone()).collect(),
compile_varargs(&args.kwarg),
varkeywords_name,
self.source_path.clone().unwrap(),
line_number,
name.to_owned(),
@ -970,9 +985,9 @@ impl<O: OutputStream> Compiler<O> {
Default::default(),
0,
vec![],
Varargs::None,
None,
vec![],
Varargs::None,
None,
self.source_path.clone().unwrap(),
line_number,
name.to_owned(),
@ -1920,9 +1935,9 @@ impl<O: OutputStream> Compiler<O> {
Default::default(),
1,
vec![".0".to_owned()],
Varargs::None,
None,
vec![],
Varargs::None,
None,
self.source_path.clone().unwrap(),
line_number,
name.clone(),
@ -2223,14 +2238,6 @@ fn compile_location(location: &ast::Location) -> bytecode::Location {
bytecode::Location::new(location.row(), location.column())
}
fn compile_varargs(varargs: &ast::Varargs) -> bytecode::Varargs {
match varargs {
ast::Varargs::None => bytecode::Varargs::None,
ast::Varargs::Unnamed => bytecode::Varargs::Unnamed,
ast::Varargs::Named(param) => bytecode::Varargs::Named(param.arg.clone()),
}
}
fn compile_conversion_flag(conversion_flag: ast::ConversionFlag) -> bytecode::ConversionFlag {
match conversion_flag {
ast::ConversionFlag::Ascii => bytecode::ConversionFlag::Ascii,