mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-09-05 01:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add nested and optimized for symtable

Browse source
This commit is contained in:
Yiqun Ling 2020-08-13 03:12:28 +08:00 • committed by GitHub
parent 3c080eb4cc
commit d8c8b11726
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/symboltable.rs
View file

@ -41,6 +41,9 @@ pub struct SymbolTable {
/// The line number in the sourcecode where this symboltable begins. /// The line number in the sourcecode where this symboltable begins.
pub line_number: usize, pub line_number: usize,
// Return True if the block is a nested class or function
pub is_nested: bool,
/// A set of symbols present on this scope level. /// A set of symbols present on this scope level.
pub symbols: IndexMap<String, Symbol>, pub symbols: IndexMap<String, Symbol>,
@ -50,11 +53,12 @@ pub struct SymbolTable {
} }
impl SymbolTable { impl SymbolTable {
fn new(name: String, typ: SymbolTableType, line_number: usize) -> Self { fn new(name: String, typ: SymbolTableType, line_number: usize, is_nested: bool) -> Self {
SymbolTable { SymbolTable {
name, name,
typ, typ,
line_number, line_number,
is_nested,
symbols: Default::default(), symbols: Default::default(),
sub_tables: vec![], sub_tables: vec![],
} }
@ -438,7 +442,12 @@ impl SymbolTableBuilder {
} }
fn enter_scope(&mut self, name: &str, typ: SymbolTableType, line_number: usize) { fn enter_scope(&mut self, name: &str, typ: SymbolTableType, line_number: usize) {
let table = SymbolTable::new(name.to_owned(), typ, line_number); let is_nested = self
.tables
.last()
.map(|table| table.is_nested || table.typ == SymbolTableType::Function)
.unwrap_or(false);
let table = SymbolTable::new(name.to_owned(), typ, line_number, is_nested);
self.tables.push(table); self.tables.push(table);
} }