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

Refactor checks for symbol in register_name

Browse source
This commit is contained in:
minoring 2020-09-06 11:40:32 +09:00
parent 678b8e779b
commit 09e4e9a86c
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/symboltable.rs
View file

@ -951,10 +951,8 @@ impl SymbolTableBuilder {
let table = self.tables.last_mut().unwrap();
let location = Default::default();
// Some checks:
let containing = table.symbols.contains_key(name);
if containing {
let symbol = table.symbols.get(name).unwrap();
// Some checks for the symbol that present on this scope level:
if let Some(symbol) = table.symbols.get(name) {
// Role already set..
match role {
SymbolUsage::Global => {
@ -1000,23 +998,21 @@ impl SymbolTableBuilder {
// Ok?
}
}
}
// Some more checks:
match role {
SymbolUsage::Nonlocal if scope_depth < 2 => {
return Err(SymbolTableError {
error: format!("cannot define nonlocal '{}' at top level.", name),
location,
})
} else {
// The symbol does not present on this scope level.
// Some checks to insert new symbol into symbol table:
match role {
SymbolUsage::Nonlocal if scope_depth < 2 => {
return Err(SymbolTableError {
error: format!("cannot define nonlocal '{}' at top level.", name),
location,
})
}
_ => {
// Ok!
}
}
_ => {
// Ok!
}
}
// Insert symbol when required:
if !containing {
// Insert symbol when required:
let symbol = Symbol::new(name);
table.symbols.insert(name.to_owned(), symbol);
}