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 remote-tracking branch 'origin/master' into try-to-use-local

Browse source
This commit is contained in:
lynskylate 2020-08-07 01:18:56 +08:00
commit a6be7eea26
2 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -9,7 +9,7 @@ edition = "2018"
[dependencies] [dependencies]
indexmap = "1.0" indexmap = "1.0"
itertools = "0.8.0" itertools = "0.9"
rustpython-bytecode = { path = "../bytecode", version = "0.1.1" } rustpython-bytecode = { path = "../bytecode", version = "0.1.1" }
rustpython-parser = { path = "../parser", version = "0.1.1" } rustpython-parser = { path = "../parser", version = "0.1.1" }
num-complex = { version = "0.2", features = ["serde"] } num-complex = { version = "0.2", features = ["serde"] }

38
src/symboltable.rs
View file

@ -97,10 +97,13 @@ pub struct Symbol {
pub name: String, pub name: String,
// pub table: SymbolTableRef, // pub table: SymbolTableRef,
pub scope: SymbolScope, pub scope: SymbolScope,
// TODO: Use bitflags replace
pub is_referenced: bool, pub is_referenced: bool,
pub is_assigned: bool, pub is_assigned: bool,
pub is_parameter: bool, pub is_parameter: bool,
pub is_free: bool, pub is_free: bool,
pub is_annotated: bool,
pub is_imported: bool,
// indicates if the symbol gets a value assigned by a named expression in a comprehension // indicates if the symbol gets a value assigned by a named expression in a comprehension
// this is required to correct the scope in the analysis. // this is required to correct the scope in the analysis.
@ -121,6 +124,8 @@ impl Symbol {
is_assigned: false, is_assigned: false,
is_parameter: false, is_parameter: false,
is_free: false, is_free: false,
is_annotated: false,
is_imported: false,
is_assign_namedexpr_in_comprehension: false, is_assign_namedexpr_in_comprehension: false,
is_iter: false, is_iter: false,
} }
@ -396,7 +401,10 @@ enum SymbolUsage {
Nonlocal, Nonlocal,
Used, Used,
Assigned, Assigned,
Imported,
AnnotationAssigned,
Parameter, Parameter,
AnnotationParameter,
AssignedNamedExprInCompr, AssignedNamedExprInCompr,
Iter, Iter,
} }
@ -462,7 +470,12 @@ impl SymbolTableBuilder {
} }
fn scan_parameter(&mut self, parameter: &ast::Parameter) -> SymbolTableResult { fn scan_parameter(&mut self, parameter: &ast::Parameter) -> SymbolTableResult {
self.register_name(&parameter.arg, SymbolUsage::Parameter) let usage = if parameter.annotation.is_some() {
SymbolUsage::AnnotationParameter
} else {
SymbolUsage::Parameter
};
self.register_name(&parameter.arg, usage)
} }
fn scan_parameters_annotations(&mut self, parameters: &[ast::Parameter]) -> SymbolTableResult { fn scan_parameters_annotations(&mut self, parameters: &[ast::Parameter]) -> SymbolTableResult {
@ -566,12 +579,12 @@ impl SymbolTableBuilder {
for name in names { for name in names {
if let Some(alias) = &name.alias { if let Some(alias) = &name.alias {
// `import mymodule as myalias` // `import mymodule as myalias`
self.register_name(alias, SymbolUsage::Assigned)?; self.register_name(alias, SymbolUsage::Imported)?;
} else { } else {
// `import module` // `import module`
self.register_name( self.register_name(
name.symbol.split('.').next().unwrap(), name.symbol.split('.').next().unwrap(),
SymbolUsage::Assigned, SymbolUsage::Imported,
)?; )?;
} }
} }
@ -603,7 +616,12 @@ impl SymbolTableBuilder {
annotation, annotation,
value, value,
} => { } => {
self.scan_expression(target, &ExpressionContext::Store)?; // https://github.com/python/cpython/blob/master/Python/symtable.c#L1233
if let ast::ExpressionType::Identifier { ref name } = target.node {
self.register_name(name, SymbolUsage::AnnotationAssigned)?;
} else {
self.scan_expression(target, &ExpressionContext::Store)?;
}
self.scan_expression(annotation, &ExpressionContext::Load)?; self.scan_expression(annotation, &ExpressionContext::Load)?;
if let Some(value) = value { if let Some(value) = value {
self.scan_expression(value, &ExpressionContext::Load)?; self.scan_expression(value, &ExpressionContext::Load)?;
@ -986,9 +1004,21 @@ impl SymbolTableBuilder {
}); });
} }
} }
SymbolUsage::Imported => {
symbol.is_assigned = true;
symbol.is_imported = true;
}
SymbolUsage::Parameter => { SymbolUsage::Parameter => {
symbol.is_parameter = true; symbol.is_parameter = true;
} }
SymbolUsage::AnnotationParameter => {
symbol.is_parameter = true;
symbol.is_annotated = true;
}
SymbolUsage::AnnotationAssigned => {
symbol.is_assigned = true;
symbol.is_annotated = true;
}
SymbolUsage::Assigned => { SymbolUsage::Assigned => {
symbol.is_assigned = true; symbol.is_assigned = true;
} }