Add module name to symbol table

Glyphack · Dec 10, 2023 · 8632087 · 8632087
1 parent db35159
commit 8632087
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/typechecker/src/semantic_analyzer.rs b/typechecker/src/semantic_analyzer.rs
@@ -37,7 +37,7 @@ pub struct SemanticAnalyzer {
 #[allow(unused)]
 impl SemanticAnalyzer {
     pub fn new(file: EnderpyFile, imports: HashMap<String, ImportResult>) -> Self {
-        let globals = SymbolTable::global();
+        let globals = SymbolTable::global(file.module_name());
         log::debug!("Creating semantic analyzer for {}", file.module_name());
         SemanticAnalyzer {
             globals,

diff --git a/typechecker/src/settings.rs b/typechecker/src/settings.rs
@@ -41,13 +41,14 @@ impl Settings {
     }
 
     pub fn test_settings() -> Self {
+        let file_dir = env::current_dir().unwrap();
         Settings {
             debug: false,
             root: PathBuf::from(""),
             follow_imports: FollowImports::All,
             import_discovery: ImportDiscovery {
                 python_executable: None,
-                typeshed_path: None,
+                typeshed_path: Some(PathBuf::from(file_dir.parent().unwrap().join("typeshed"))),
             },
         }
     }

diff --git a/typechecker/src/state.rs b/typechecker/src/state.rs
@@ -23,9 +23,10 @@ pub struct State {
 
 impl State {
     pub fn new(file: EnderpyFile) -> Self {
+        let module_name = file.module_name();
         Self {
             file,
-            symbol_table: SymbolTable::global(),
+            symbol_table: SymbolTable::global(module_name),
             diagnostics: Vec::new(),
             imports: HashMap::new(),
         }
@@ -36,7 +37,9 @@ impl State {
         for stmt in &self.file.body {
             sem_anal.visit_stmt(stmt)
         }
-        self.symbol_table = sem_anal.globals
+        // TODO: Hacky way to add the global scope to all scopes in symbol table after finishing
+        sem_anal.globals.exit_scope();
+        self.symbol_table = sem_anal.globals;
     }
 
     pub fn get_symbol_table(&self) -> SymbolTable {

diff --git a/typechecker/src/symbol_table.rs b/typechecker/src/symbol_table.rs
@@ -15,6 +15,9 @@ pub struct SymbolTable {
     /// The distance between the current scope and the scope where the symbol
     /// was defined
     _locals: HashMap<ast::Expression, u8>,
+
+    /// Name of the module that this symbol table is for
+    pub module_name: String,
 }
 
 #[derive(Debug, Clone)]
@@ -205,7 +208,7 @@ pub enum SymbolScope {
 }
 
 impl SymbolTable {
-    pub fn global() -> Self {
+    pub fn global(module_name: String) -> Self {
         let mut builtin_scope = SymbolTableScope {
             id: get_id(),
             symbol_table_type: SymbolTableType::BUILTIN,
@@ -293,6 +296,7 @@ impl SymbolTable {
             scopes: vec![builtin_scope, global_scope],
             all_scopes: vec![],
             _locals: HashMap::new(),
+            module_name,
         }
     }
 
@@ -328,6 +332,7 @@ impl SymbolTable {
             Some(pos) => {
                 let mut innermost_scope = self.innermost_scope(pos);
                 while let Some(scope) = innermost_scope {
+                    log::debug!("lookin in scope: {:?}", scope.name);
                     if let Some(symbol) = scope.symbols.get(&lookup_request.name) {
                         return Some(symbol);
                     }
@@ -346,7 +351,7 @@ impl SymbolTable {
                 }
             }
             None => {
-                if let Some(symbol) = self.current_scope().symbols.get(&lookup_request.name) {
+                if let Some(symbol) = self.global_scope().symbols.get(&lookup_request.name) {
                     return Some(symbol);
                 }
             }
@@ -367,7 +372,7 @@ impl SymbolTable {
     }
 
     pub fn global_scope(&self) -> &SymbolTableScope {
-        self.scopes
+        self.all_scopes
             .iter()
             .filter(|scope| scope.symbol_table_type == SymbolTableType::Module)
             .last()
@@ -376,9 +381,12 @@ impl SymbolTable {
 
     pub fn exit_scope(&mut self) {
         let finished_scope = self.scopes.pop();
-        match finished_scope {
-            Some(scope) => self.all_scopes.push(scope),
-            None => panic!("tried to exit non-existent scope"),
+        if let Some(scope) = finished_scope {
+            // Also pop the builtin scope if we are exiting the global scope
+            // if scope.symbol_table_type == SymbolTableType::Module {
+            //     self.all_scopes.push(self.scopes.pop().unwrap());
+            // }
+            self.all_scopes.push(scope);
         }
     }