mirror of
https://github.com/RustPython/Parser.git
synced 2025-07-19 19:15:43 +00:00
Make peephole optimizer a stream processor
This commit is contained in:
coolreader18
parent
8d1da0920d
commit
e9ad1f64ee
5 changed files with 195 additions and 86 deletions
117
src/compile.rs
117
src/compile.rs
|
|
@ -6,13 +6,17 @@
|
|||
//! https://github.com/micropython/micropython/blob/master/py/compile.c
|
||||
|
||||
use crate::error::{CompileError, CompileErrorType};
|
||||
use crate::output_stream::{CodeObjectStream, OutputStream};
|
||||
use crate::peephole::PeepholeOptimizer;
|
||||
use crate::symboltable::{make_symbol_table, statements_to_symbol_table, Symbol, SymbolScope};
|
||||
use num_complex::Complex64;
|
||||
use rustpython_bytecode::bytecode::{self, CallType, CodeObject, Instruction, Varargs};
|
||||
use rustpython_parser::{ast, parser};
|
||||
|
||||
struct Compiler {
|
||||
code_object_stack: Vec<CodeObject>,
|
||||
type BasicOutputStream = PeepholeOptimizer<CodeObjectStream>;
|
||||
|
||||
struct Compiler<O: OutputStream = BasicOutputStream> {
|
||||
output_stack: Vec<O>,
|
||||
scope_stack: Vec<SymbolScope>,
|
||||
nxt_label: usize,
|
||||
source_path: Option<String>,
|
||||
|
|
@ -109,18 +113,21 @@ enum EvalContext {
|
|||
Expression,
|
||||
}
|
||||
|
||||
type Label = usize;
|
||||
pub(crate) type Label = usize;
|
||||
|
||||
impl Default for Compiler {
|
||||
impl<O> Default for Compiler<O>
|
||||
where
|
||||
O: OutputStream + Default,
|
||||
{
|
||||
fn default() -> Self {
|
||||
Compiler::new(0)
|
||||
}
|
||||
}
|
||||
|
||||
impl Compiler {
|
||||
impl<O: OutputStream> Compiler<O> {
|
||||
fn new(optimize: u8) -> Self {
|
||||
Compiler {
|
||||
code_object_stack: Vec::new(),
|
||||
output_stack: Vec::new(),
|
||||
scope_stack: Vec::new(),
|
||||
nxt_label: 0,
|
||||
source_path: None,
|
||||
|
|
@ -132,9 +139,13 @@ impl Compiler {
|
|||
}
|
||||
}
|
||||
|
||||
fn push_output(&mut self, code: CodeObject) {
|
||||
self.output_stack.push(code.into());
|
||||
}
|
||||
|
||||
fn push_new_code_object(&mut self, obj_name: String) {
|
||||
let line_number = self.get_source_line_number();
|
||||
self.code_object_stack.push(CodeObject::new(
|
||||
self.push_output(CodeObject::new(
|
||||
Vec::new(),
|
||||
Varargs::None,
|
||||
Vec::new(),
|
||||
|
|
@ -146,8 +157,7 @@ impl Compiler {
|
|||
}
|
||||
|
||||
fn pop_code_object(&mut self) -> CodeObject {
|
||||
// self.scope_stack.pop().unwrap();
|
||||
self.code_object_stack.pop().unwrap()
|
||||
self.output_stack.pop().unwrap().into()
|
||||
}
|
||||
|
||||
fn compile_program(
|
||||
|
|
@ -155,10 +165,10 @@ impl Compiler {
|
|||
program: &ast::Program,
|
||||
symbol_scope: SymbolScope,
|
||||
) -> Result<(), CompileError> {
|
||||
let size_before = self.code_object_stack.len();
|
||||
let size_before = self.output_stack.len();
|
||||
self.scope_stack.push(symbol_scope);
|
||||
self.compile_statements(&program.statements)?;
|
||||
assert!(self.code_object_stack.len() == size_before);
|
||||
assert_eq!(self.output_stack.len(), size_before);
|
||||
|
||||
// Emit None at end:
|
||||
self.emit(Instruction::LoadConst {
|
||||
|
|
@ -636,7 +646,7 @@ impl Compiler {
|
|||
}
|
||||
|
||||
let line_number = self.get_source_line_number();
|
||||
self.code_object_stack.push(CodeObject::new(
|
||||
self.push_output(CodeObject::new(
|
||||
args.args.iter().map(|a| a.arg.clone()).collect(),
|
||||
compile_varargs(&args.vararg),
|
||||
args.kwonlyargs.iter().map(|a| a.arg.clone()).collect(),
|
||||
|
|
@ -889,7 +899,7 @@ impl Compiler {
|
|||
self.prepare_decorators(decorator_list)?;
|
||||
self.emit(Instruction::LoadBuildClass);
|
||||
let line_number = self.get_source_line_number();
|
||||
self.code_object_stack.push(CodeObject::new(
|
||||
self.push_output(CodeObject::new(
|
||||
vec![],
|
||||
Varargs::None,
|
||||
vec![],
|
||||
|
|
@ -1481,7 +1491,6 @@ impl Compiler {
|
|||
self.set_label(end_label);
|
||||
}
|
||||
}
|
||||
self.optimize_instruction();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
@ -1620,7 +1629,7 @@ impl Compiler {
|
|||
|
||||
let line_number = self.get_source_line_number();
|
||||
// Create magnificent function <listcomp>:
|
||||
self.code_object_stack.push(CodeObject::new(
|
||||
self.push_output(CodeObject::new(
|
||||
vec![".0".to_string()],
|
||||
Varargs::None,
|
||||
vec![],
|
||||
|
|
@ -1799,61 +1808,6 @@ impl Compiler {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
fn optimize_instruction(&mut self) {
|
||||
let instructions = self.current_instructions();
|
||||
match instructions.pop().unwrap() {
|
||||
Instruction::BinaryOperation { op, inplace } => {
|
||||
macro_rules! lc {
|
||||
($name:ident {$($field:tt)*}) => {
|
||||
Instruction::LoadConst {
|
||||
value: bytecode::Constant::$name {$($field)*},
|
||||
}
|
||||
};
|
||||
($name:ident, $($value:tt)*) => {
|
||||
lc!($name { value: $($value)* })
|
||||
};
|
||||
}
|
||||
macro_rules! emitconst {
|
||||
($($arg:tt)*) => {
|
||||
self.emit(lc!($($arg)*))
|
||||
};
|
||||
}
|
||||
macro_rules! op {
|
||||
($op:ident) => {
|
||||
bytecode::BinaryOperator::$op
|
||||
};
|
||||
}
|
||||
let rhs = instructions.pop().unwrap();
|
||||
let lhs = instructions.pop().unwrap();
|
||||
match (op, lhs, rhs) {
|
||||
(op!(Add), lc!(Integer, lhs), lc!(Integer, rhs)) => {
|
||||
emitconst!(Integer, lhs + rhs)
|
||||
}
|
||||
(op!(Subtract), lc!(Integer, lhs), lc!(Integer, rhs)) => {
|
||||
emitconst!(Integer, lhs - rhs)
|
||||
}
|
||||
(op!(Add), lc!(Float, lhs), lc!(Float, rhs)) => emitconst!(Float, lhs + rhs),
|
||||
(op!(Subtract), lc!(Float, lhs), lc!(Float, rhs)) => {
|
||||
emitconst!(Float, lhs - rhs)
|
||||
}
|
||||
(op!(Power), lc!(Float, lhs), lc!(Float, rhs)) => {
|
||||
emitconst!(Float, lhs.powf(rhs))
|
||||
}
|
||||
(op!(Add), lc!(String, mut lhs), lc!(String, rhs)) => {
|
||||
lhs.push_str(&rhs);
|
||||
emitconst!(String, lhs);
|
||||
}
|
||||
(op, lhs, rhs) => {
|
||||
self.emit(lhs);
|
||||
self.emit(rhs);
|
||||
self.emit(Instruction::BinaryOperation { op, inplace });
|
||||
}
|
||||
}
|
||||
}
|
||||
other => self.emit(other),
|
||||
}
|
||||
}
|
||||
|
||||
// Scope helpers:
|
||||
fn enter_scope(&mut self) {
|
||||
// println!("Enter scope {:?}", self.scope_stack);
|
||||
|
|
@ -1877,18 +1831,11 @@ impl Compiler {
|
|||
// Low level helper functions:
|
||||
fn emit(&mut self, instruction: Instruction) {
|
||||
let location = compile_location(&self.current_source_location);
|
||||
let cur_code_obj = self.current_code_object();
|
||||
cur_code_obj.instructions.push(instruction);
|
||||
cur_code_obj.locations.push(location);
|
||||
// TODO: insert source filename
|
||||
}
|
||||
|
||||
fn current_code_object(&mut self) -> &mut CodeObject {
|
||||
self.code_object_stack.last_mut().unwrap()
|
||||
}
|
||||
|
||||
fn current_instructions(&mut self) -> &mut Vec<Instruction> {
|
||||
&mut self.current_code_object().instructions
|
||||
self.output_stack
|
||||
.last_mut()
|
||||
.unwrap()
|
||||
.emit(instruction, location);
|
||||
}
|
||||
|
||||
// Generate a new label
|
||||
|
|
@ -1900,9 +1847,7 @@ impl Compiler {
|
|||
|
||||
// Assign current position the given label
|
||||
fn set_label(&mut self, label: Label) {
|
||||
let position = self.current_code_object().instructions.len();
|
||||
// assert!(label not in self.label_map)
|
||||
self.current_code_object().label_map.insert(label, position);
|
||||
self.output_stack.last_mut().unwrap().set_label(label)
|
||||
}
|
||||
|
||||
fn set_source_location(&mut self, location: &ast::Location) {
|
||||
|
|
@ -1922,7 +1867,7 @@ impl Compiler {
|
|||
}
|
||||
|
||||
fn mark_generator(&mut self) {
|
||||
self.current_code_object().is_generator = true;
|
||||
self.output_stack.last_mut().unwrap().mark_generator();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1971,7 +1916,7 @@ mod tests {
|
|||
use rustpython_parser::parser;
|
||||
|
||||
fn compile_exec(source: &str) -> CodeObject {
|
||||
let mut compiler: Compiler = Default::default();
|
||||
let mut compiler = Compiler::default();
|
||||
compiler.source_path = Some("source_path".to_string());
|
||||
compiler.push_new_code_object("<module>".to_string());
|
||||
let ast = parser::parse_program(&source.to_string()).unwrap();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue