mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-08 21:55:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a settings struct for storage of different settings which influence the VM.

Browse source
This commit is contained in:
Windel Bouwman 2019-07-13 12:23:53 +02:00
parent de5e71a9db
commit 5e468baa16
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/compile.rs
View file

@ -20,7 +20,7 @@ struct Compiler {
current_qualified_path: Option<String>, current_qualified_path: Option<String>,
in_loop: bool, in_loop: bool,
in_function_def: bool, in_function_def: bool,
optimize: bool, optimize: u8,
} }
/// Compile a given sourcecode into a bytecode object. /// Compile a given sourcecode into a bytecode object.
@ -28,7 +28,7 @@ pub fn compile(
source: &str, source: &str,
mode: &Mode, mode: &Mode,
source_path: String, source_path: String,
optimize: bool, optimize: u8,
) -> Result<CodeObject, CompileError> { ) -> Result<CodeObject, CompileError> {
match mode { match mode {
Mode::Exec => { Mode::Exec => {
@ -49,7 +49,7 @@ pub fn compile(
/// A helper function for the shared code of the different compile functions /// A helper function for the shared code of the different compile functions
fn with_compiler( fn with_compiler(
source_path: String, source_path: String,
optimize: bool, optimize: u8,
f: impl FnOnce(&mut Compiler) -> Result<(), CompileError>, f: impl FnOnce(&mut Compiler) -> Result<(), CompileError>,
) -> Result<CodeObject, CompileError> { ) -> Result<CodeObject, CompileError> {
let mut compiler = Compiler::new(optimize); let mut compiler = Compiler::new(optimize);
@ -65,7 +65,7 @@ fn with_compiler(
pub fn compile_program( pub fn compile_program(
ast: ast::Program, ast: ast::Program,
source_path: String, source_path: String,
optimize: bool, optimize: u8,
) -> Result<CodeObject, CompileError> { ) -> Result<CodeObject, CompileError> {
with_compiler(source_path, optimize, |compiler| { with_compiler(source_path, optimize, |compiler| {
let symbol_table = make_symbol_table(&ast)?; let symbol_table = make_symbol_table(&ast)?;
@ -77,7 +77,7 @@ pub fn compile_program(
pub fn compile_statement_eval( pub fn compile_statement_eval(
statement: Vec<ast::LocatedStatement>, statement: Vec<ast::LocatedStatement>,
source_path: String, source_path: String,
optimize: bool, optimize: u8,
) -> Result<CodeObject, CompileError> { ) -> Result<CodeObject, CompileError> {
with_compiler(source_path, optimize, |compiler| { with_compiler(source_path, optimize, |compiler| {
let symbol_table = statements_to_symbol_table(&statement)?; let symbol_table = statements_to_symbol_table(&statement)?;
@ -89,7 +89,7 @@ pub fn compile_statement_eval(
pub fn compile_program_single( pub fn compile_program_single(
ast: ast::Program, ast: ast::Program,
source_path: String, source_path: String,
optimize: bool, optimize: u8,
) -> Result<CodeObject, CompileError> { ) -> Result<CodeObject, CompileError> {
with_compiler(source_path, optimize, |compiler| { with_compiler(source_path, optimize, |compiler| {
let symbol_table = make_symbol_table(&ast)?; let symbol_table = make_symbol_table(&ast)?;
@ -113,12 +113,12 @@ type Label = usize;
impl Default for Compiler { impl Default for Compiler {
fn default() -> Self { fn default() -> Self {
Compiler::new(false) Compiler::new(0)
} }
} }
impl Compiler { impl Compiler {
fn new(optimize: bool) -> Self { fn new(optimize: u8) -> Self {
Compiler { Compiler {
code_object_stack: Vec::new(), code_object_stack: Vec::new(),
scope_stack: Vec::new(), scope_stack: Vec::new(),
@ -455,7 +455,7 @@ impl Compiler {
} => self.compile_class_def(name, body, bases, keywords, decorator_list)?, } => self.compile_class_def(name, body, bases, keywords, decorator_list)?,
ast::Statement::Assert { test, msg } => { ast::Statement::Assert { test, msg } => {
// if some flag, ignore all assert statements! // if some flag, ignore all assert statements!
if !self.optimize { if self.optimize == 0 {
let end_label = self.new_label(); let end_label = self.new_label();
self.compile_test(test, Some(end_label), None, EvalContext::Statement)?; self.compile_test(test, Some(end_label), None, EvalContext::Statement)?;
self.emit(Instruction::LoadName { self.emit(Instruction::LoadName {