Refactor checks for symbol in register_name

src/symboltable.rs

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