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

Compiler::qualified_name as vec

Browse source
This commit is contained in:
Jeong YunWon 2021-08-27 23:45:47 +09:00
parent 88321d9319
commit acd73d21fe
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/compile.rs
View file

@ -56,7 +56,7 @@ struct Compiler {
symbol_table_stack: Vec<SymbolTable>, symbol_table_stack: Vec<SymbolTable>,
source_path: String, source_path: String,
current_source_location: ast::Location, current_source_location: ast::Location,
current_qualified_path: Option<String>, qualified_path: Vec<String>,
done_with_future_stmts: bool, done_with_future_stmts: bool,
ctx: CompileContext, ctx: CompileContext,
class_name: Option<String>, class_name: Option<String>,
@ -190,7 +190,7 @@ impl Compiler {
symbol_table_stack: Vec::new(), symbol_table_stack: Vec::new(),
source_path, source_path,
current_source_location: ast::Location::default(), current_source_location: ast::Location::default(),
current_qualified_path: None, qualified_path: Vec::new(),
done_with_future_stmts: false, done_with_future_stmts: false,
ctx: CompileContext { ctx: CompileContext {
loop_data: None, loop_data: None,
@ -1020,10 +1020,9 @@ impl Compiler {
}, },
}; };
let old_qualified_path = self.current_qualified_path.clone(); self.push_qualified_path(name);
self.push_qualified_name(name); let qualified_name = self.qualified_path.join(".");
let qualified_name = self.current_qualified_path.clone().unwrap(); self.push_qualified_path("<locals>");
self.push_qualified_name("<locals>");
let (body, doc_str) = get_doc(body); let (body, doc_str) = get_doc(body);
@ -1041,7 +1040,8 @@ impl Compiler {
} }
let code = self.pop_code_object(); let code = self.pop_code_object();
self.current_qualified_path = old_qualified_path; self.qualified_path.pop();
self.qualified_path.pop();
self.ctx = prev_ctx; self.ctx = prev_ctx;
// Prepare type annotations: // Prepare type annotations:
@ -1191,9 +1191,8 @@ impl Compiler {
let prev_class_name = std::mem::replace(&mut self.class_name, Some(name.to_owned())); let prev_class_name = std::mem::replace(&mut self.class_name, Some(name.to_owned()));
let old_qualified_path = self.current_qualified_path.clone(); self.push_qualified_path(name);
self.push_qualified_name(name); let qualified_name = self.qualified_path.join(".");
let qualified_name = self.current_qualified_path.clone().unwrap();
self.push_output(bytecode::CodeFlags::empty(), 0, 0, 0, name.to_owned()); self.push_output(bytecode::CodeFlags::empty(), 0, 0, 0, name.to_owned());
@ -1239,7 +1238,7 @@ impl Compiler {
let code = self.pop_code_object(); let code = self.pop_code_object();
self.class_name = prev_class_name; self.class_name = prev_class_name;
self.current_qualified_path = old_qualified_path; self.qualified_path.pop();
self.ctx = prev_ctx; self.ctx = prev_ctx;
let mut funcflags = bytecode::MakeFunctionFlags::empty(); let mut funcflags = bytecode::MakeFunctionFlags::empty();
@ -2465,13 +2464,8 @@ impl Compiler {
self.current_source_location.row() self.current_source_location.row()
} }
fn push_qualified_name(&mut self, name: &str) { fn push_qualified_path(&mut self, name: &str) {
if let Some(ref mut qualified_path) = self.current_qualified_path { self.qualified_path.push(name.to_owned());
qualified_path.push('.');
qualified_path.push_str(name);
} else {
self.current_qualified_path = Some(name.to_owned());
}
} }
fn mark_generator(&mut self) { fn mark_generator(&mut self) {