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

Misc fixes

Browse source
This commit is contained in:
Noah 2021-01-10 20:21:10 -06:00
parent dc8b93a417
commit f1970bfbf9
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/compile.rs
View file

@ -1082,7 +1082,12 @@ impl Compiler {
} }
for var in &*code.freevars { for var in &*code.freevars {
let table = self.symbol_table_stack.last().unwrap(); let table = self.symbol_table_stack.last().unwrap();
let symbol = table.lookup(var).unwrap(); let symbol = table.lookup(var).unwrap_or_else(|| {
panic!(
"couldn't look up var {} in {} in {}",
var, code.obj_name, self.source_path
)
});
let parent_code = self.code_stack.last().unwrap(); let parent_code = self.code_stack.last().unwrap();
let vars = match symbol.scope { let vars = match symbol.scope {
SymbolScope::Free => &parent_code.freevar_cache, SymbolScope::Free => &parent_code.freevar_cache,
@ -1984,7 +1989,7 @@ impl Compiler {
unpack: false, unpack: false,
}), }),
generators, generators,
&mut |compiler| { &|compiler| {
compiler.compile_comprehension_element(elt)?; compiler.compile_comprehension_element(elt)?;
compiler.emit(Instruction::ListAppend { compiler.emit(Instruction::ListAppend {
i: (1 + generators.len()) as u32, i: (1 + generators.len()) as u32,
@ -2001,7 +2006,7 @@ impl Compiler {
unpack: false, unpack: false,
}), }),
generators, generators,
&mut |compiler| { &|compiler| {
compiler.compile_comprehension_element(elt)?; compiler.compile_comprehension_element(elt)?;
compiler.emit(Instruction::SetAdd { compiler.emit(Instruction::SetAdd {
i: (1 + generators.len()) as u32, i: (1 + generators.len()) as u32,
@ -2023,7 +2028,7 @@ impl Compiler {
unpack: false, unpack: false,
}), }),
generators, generators,
&mut |compiler| { &|compiler| {
// changed evaluation order for Py38 named expression PEP 572 // changed evaluation order for Py38 named expression PEP 572
compiler.compile_expression(key)?; compiler.compile_expression(key)?;
compiler.compile_expression(value)?; compiler.compile_expression(value)?;
@ -2037,7 +2042,7 @@ impl Compiler {
)?; )?;
} }
GeneratorExp { elt, generators } => { GeneratorExp { elt, generators } => {
self.compile_comprehension("<genexpr>", None, generators, &mut |compiler| { self.compile_comprehension("<genexpr>", None, generators, &|compiler| {
compiler.compile_comprehension_element(elt)?; compiler.compile_comprehension_element(elt)?;
compiler.mark_generator(); compiler.mark_generator();
compiler.emit(Instruction::YieldValue); compiler.emit(Instruction::YieldValue);
@ -2046,9 +2051,6 @@ impl Compiler {
Ok(()) Ok(())
})?; })?;
} }
// Comprehension { kind, generators } => {
// self.compile_comprehension(kind, generators)?;
// }
Starred { .. } => { Starred { .. } => {
return Err(self.error(CompileErrorType::InvalidStarExpr)); return Err(self.error(CompileErrorType::InvalidStarExpr));
} }

12
src/symboltable.rs
View file

@ -358,15 +358,11 @@ impl SymbolTableAnalyzer {
} }
fn found_in_outer_scope(&mut self, name: &str) -> Option<SymbolScope> { fn found_in_outer_scope(&mut self, name: &str) -> Option<SymbolScope> {
// Interesting stuff about the __class__ variable:
// https://docs.python.org/3/reference/datamodel.html?highlight=__class__#creating-the-class-object
if name == "__class__" {
return Some(SymbolScope::Free);
}
let mut decl_depth = None; let mut decl_depth = None;
for (i, (symbols, typ)) in self.tables.iter().rev().enumerate() { for (i, (symbols, typ)) in self.tables.iter().rev().enumerate() {
if let SymbolTableType::Class | SymbolTableType::Module = typ { if matches!(typ, SymbolTableType::Module)
|| matches!(typ, SymbolTableType::Class if name != "__class__")
{
continue; continue;
} }
if let Some(sym) = symbols.get(name) { if let Some(sym) = symbols.get(name) {
@ -958,6 +954,8 @@ impl SymbolTableBuilder {
self.register_name(id, SymbolUsage::Iter, location)?; self.register_name(id, SymbolUsage::Iter, location)?;
} }
} }
// Interesting stuff about the __class__ variable:
// https://docs.python.org/3/reference/datamodel.html?highlight=__class__#creating-the-class-object
if context == ExpressionContext::Load if context == ExpressionContext::Load
&& self.tables.last().unwrap().typ == SymbolTableType::Function && self.tables.last().unwrap().typ == SymbolTableType::Function
&& id == "super" && id == "super"