Extend scope functionality

spicelang · Nov 7, 2022 · a4c91db · a4c91db
1 parent 1960d3f
commit a4c91db
Show file tree

Hide file tree

Showing 11 changed files with 546 additions and 101 deletions.
diff --git a/src-bootstrap/symbol/SymbolTable.spice b/src-bootstrap/symbol/SymbolTable.spice
@@ -46,7 +46,7 @@ public type SymbolTable struct {
     bool inMainSourceFile
     bool isSourceFileRootScope
     bool isShadowTable
-    bool isCapturingRequired
+    bool capturingRequired
 }
 
 public p SymbolTable.ctor(
@@ -61,7 +61,7 @@ public p SymbolTable.ctor(
     this.inMainSourceFile = inMainSourceFile;
     this.isSourceFileRootScope = isSourceFileRoot;
     this.isShadowTable = false;
-    this.isCapturingRequired = false;
+    this.capturingRequired = false;
 }
 
 /**
@@ -127,7 +127,7 @@ public f<ste::SymbolTableEntry*> SymbolTable.lookup(const string name) {
         if entry == nil<SymbolTable*> { return nil<ste::SymbolTableEntry*>; }
 
         // Check if this scope requires capturing and capture the variable if appropriate
-        if this.isCapturingRequired && !this.captures.contains(name) && !entry.ty.isOneOf({TY_IMPORT, TY_FUNCTION, TY_PROCEDURE}) {
+        if this.capturingRequired && !this.captures.contains(name) && !entry.ty.isOneOf({TY_IMPORT, TY_FUNCTION, TY_PROCEDURE}) {
             this.captures.insert(name, cpt::Capture(entry));
         }
     }

diff --git a/src/global/RuntimeModuleManager.cpp b/src/global/RuntimeModuleManager.cpp
@@ -4,7 +4,6 @@
 
 #include <SourceFile.h>
 #include <scope/Scope.h>
-#include <symbol/SymbolTable.h>
 #include <util/FileUtil.h>
 
 #include <ast/ASTNodes.h>
@@ -18,9 +17,9 @@ SourceFile *RuntimeModuleManager::requestModule(SourceFile *sourceFile, const Ru
   return available ? modules.at(moduleName) : nullptr;
 }
 
-SymbolTable *RuntimeModuleManager::getModuleScope(const RuntimeModuleName &moduleName) const {
+Scope *RuntimeModuleManager::getModuleScope(const RuntimeModuleName &moduleName) const {
   assert(modules.contains(moduleName));
-  return &modules.at(moduleName)->globalScope->symbolTable;
+  return modules.at(moduleName)->globalScope.get();
 }
 
 bool RuntimeModuleManager::isModuleAvailable(const RuntimeModuleName &module) const { return modules.contains(module); }

diff --git a/src/global/RuntimeModuleManager.h b/src/global/RuntimeModuleManager.h
@@ -2,11 +2,11 @@
 
 #pragma once
 
-#include <map>
+#include <unordered_map>
 
 // Forward declaration
 class SourceFile;
-class SymbolTable;
+class Scope;
 
 const char *const STRING_RT_IMPORT_NAME = "__rt_string";
 const char *const THREAD_RT_IMPORT_NAME = "__rt_thread";
@@ -17,13 +17,13 @@ class RuntimeModuleManager {
 public:
   // Public methods
   SourceFile *requestModule(SourceFile *sourceFile, const RuntimeModuleName &moduleName);
-  [[nodiscard]] SymbolTable *getModuleScope(const RuntimeModuleName &moduleName) const;
+  [[nodiscard]] Scope *getModuleScope(const RuntimeModuleName &moduleName) const;
   [[nodiscard]] bool isModuleAvailable(const RuntimeModuleName &moduleName) const;
 
 private:
   // Private methods
   bool addModule(SourceFile *parentSourceFile, const RuntimeModuleName &moduleName);
 
   // Private fields
-  std::map<RuntimeModuleName, SourceFile *> modules;
+  std::unordered_map<RuntimeModuleName, SourceFile *> modules;
 };