varname_cache copies it

youknowone · youknowone · commit db374ae49789 · 2025-07-11T22:01:11.000+09:00
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -399,6 +399,13 @@ impl Compiler<'_> {
             .map(|(var, _)| var.clone())
             .collect();
 
+        // Initialize varname_cache from SymbolTable::varnames
+        let varname_cache: IndexSet<String> = table
+            .varnames
+            .iter()
+            .cloned()
+            .collect();
+
         // Qualname will be set later by set_qualname
         let qualname = None;
 
@@ -420,7 +427,7 @@ impl Compiler<'_> {
             current_block: ir::BlockIdx(0),
             constants: IndexSet::default(),
             name_cache: IndexSet::default(),
-            varname_cache: IndexSet::default(),
+            varname_cache,
             cellvar_cache,
             freevar_cache,
         };
diff --git a/compiler/codegen/src/symboltable.rs b/compiler/codegen/src/symboltable.rs
@@ -626,6 +626,8 @@ impl SymbolTableBuilder<'_> {
             .unwrap_or(false);
         let table = SymbolTable::new(name.to_owned(), typ, line_number, is_nested);
         self.tables.push(table);
+        // Clear current_varnames for the new scope
+        self.current_varnames.clear();
     }
 
     /// Pop symbol table and add to sub table of parent table.

Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,8 @@ impl SymbolTableBuilder<'_> {`
`626`	`626`	`.unwrap_or(false);`
`627`	`627`	`let table = SymbolTable::new(name.to_owned(), typ, line_number, is_nested);`
`628`	`628`	`self.tables.push(table);`
	`629`	`+ // Clear current_varnames for the new scope`
	`630`	`+ self.current_varnames.clear();`
`629`	`631`	`}`
`630`	`632`
`631`	`633`	`/// Pop symbol table and add to sub table of parent table.`