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

Merge pull request #1336 from RustPython/comprehension-scope

Browse source 
Add symboltable scope for comprehensions.
This commit is contained in:
Windel Bouwman 2019-09-04 15:45:55 +02:00 • committed by GitHub
commit f98d54f09f
2 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/compile.rs
View file

@ -1782,6 +1782,7 @@ impl<O: OutputStream> Compiler<O> {
line_number,
name.clone(),
));
self.enter_scope();
// Create empty object of proper type:
match kind {
@ -1891,6 +1892,9 @@ impl<O: OutputStream> Compiler<O> {
// Fetch code for listcomp function:
let code = self.pop_code_object();
// Pop scope
self.leave_scope();
// List comprehension code:
self.emit(Instruction::LoadConst {
value: bytecode::Constant::Code {

31
src/symboltable.rs
View file

@ -591,6 +591,23 @@ impl SymbolTableBuilder {
self.scan_expressions(elements, context)?;
}
Comprehension { kind, generators } => {
// Comprehensions are compiled as functions, so create a scope for them:
let scope_name = match **kind {
ast::ComprehensionKind::GeneratorExpression { .. } => "genexpr",
ast::ComprehensionKind::List { .. } => "listcomp",
ast::ComprehensionKind::Set { .. } => "setcomp",
ast::ComprehensionKind::Dict { .. } => "dictcomp",
};
self.enter_scope(
scope_name,
SymbolTableType::Function,
expression.location.row(),
);
// Register the passed argument to the generator function as the name ".0"
self.register_name(".0", SymbolUsage::Parameter)?;
match **kind {
ast::ComprehensionKind::GeneratorExpression { ref element }
| ast::ComprehensionKind::List { ref element }
@ -603,13 +620,25 @@ impl SymbolTableBuilder {
}
}
let mut is_first_generator = true;
for generator in generators {
self.scan_expression(&generator.target, &ExpressionContext::Store)?;
self.scan_expression(&generator.iter, &ExpressionContext::Load)?;
if is_first_generator {
is_first_generator = false;
} else {
self.scan_expression(&generator.iter, &ExpressionContext::Load)?;
}
for if_expr in &generator.ifs {
self.scan_expression(if_expr, &ExpressionContext::Load)?;
}
}
self.leave_scope();
// The first iterable is passed as an argument into the created function:
assert!(!generators.is_empty());
self.scan_expression(&generators[0].iter, &ExpressionContext::Load)?;
}
Call {
function,