no panic on symbol lookup fail

arihant2math · arihant2math · commit aeb9715ae66e · 2025-03-02T21:39:46.000-08:00
Signed-off-by: Ashwin Naren &lt;arihant2math@gmail.com&gt;
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -507,9 +507,17 @@ impl Compiler {
         self.check_forbidden_name(&name, usage)?;
 
         let symbol_table = self.symbol_table_stack.last().unwrap();
-        let symbol = symbol_table.lookup(name.as_ref()).unwrap_or_else(||
-            panic!("The symbol '{name}' must be present in the symbol table, even when it is undefined in python."),
-        );
+        let symbol = match symbol_table.lookup(name.as_ref()) {
+            Some(s) => s,
+            None => {
+                return Err(self.error_loc(
+                    CodegenErrorType::SymbolLookupError {
+                        symbol: name.to_string(),
+                    },
+                    self.current_source_location,
+                ));
+            }
+        };
         let info = self.code_stack.last_mut().unwrap();
         let mut cache = &mut info.name_cache;
         enum NameOpType {
diff --git a/compiler/codegen/src/error.rs b/compiler/codegen/src/error.rs
@@ -33,6 +33,7 @@ pub enum CodegenErrorType {
     DuplicateStore(String),
     InvalidMatchCase,
     NotImplementedYet, // RustPython marker for unimplemented features
+    SymbolLookupError { symbol: String },
 }
 
 impl std::error::Error for CodegenErrorType {}
@@ -85,6 +86,9 @@ impl fmt::Display for CodegenErrorType {
             }
             NotImplementedYet => {
                 write!(f, "RustPython does not implement this feature yet")
+            },
+            SymbolLookupError { symbol } => {
+                write!(f, "The symbol {symbol} must be present in the symbol table, even when it is undefined in python")
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ pub enum CodegenErrorType {`
`33`	`33`	`DuplicateStore(String),`
`34`	`34`	`InvalidMatchCase,`
`35`	`35`	`NotImplementedYet, // RustPython marker for unimplemented features`
	`36`	`+ SymbolLookupError { symbol: String },`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`impl std::error::Error for CodegenErrorType {}`
`@@ -85,6 +86,9 @@ impl fmt::Display for CodegenErrorType {`
`85`	`86`	`}`
`86`	`87`	`NotImplementedYet => {`
`87`	`88`	`write!(f, "RustPython does not implement this feature yet")`
	`89`	`+ },`
	`90`	`+ SymbolLookupError { symbol } => {`
	`91`	`+ write!(f, "The symbol {symbol} must be present in the symbol table, even when it is undefined in python")`
`88`	`92`	`}`
`89`	`93`	`}`
`90`	`94`	`}`