Define LocalScope.empty for really empty scopes

enso-org · Aug 28, 2024 · 88ecb93 · 88ecb93
1 parent fdcd78c
commit 88ecb93
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/context/LocalScope.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/context/LocalScope.scala
@@ -141,6 +141,18 @@ class LocalScope(
   }
 }
 object LocalScope {
+  val empty: LocalScope = {
+    val graph = new AliasGraph
+    val info  = DataflowAnalysis.DependencyInfo()
+    val emptyVariableNames = new FramePointerAnalysis.FramePointerMeta(null, Some(List()))
+    new LocalScope(
+      None,
+      () => graph,
+      () => graph.rootScope,
+      () => info,
+      () => emptyVariableNames
+    )
+  }
 
   /** Constructs a local scope for an [[EnsoRootNode]].
     *

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/AtomConstructor.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/AtomConstructor.java
@@ -112,7 +112,7 @@ public AtomConstructor initializeFields(
     return initializeFields(
         language,
         null,
-        LocalScope.root(),
+        LocalScope.empty(),
         scopeBuilder,
         new ExpressionNode[0],
         reads,

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/GetFieldNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/GetFieldNode.java
@@ -24,7 +24,7 @@ final class GetFieldNode extends EnsoRootNode {
    * @param index the index this node should use for field lookup.
    */
   GetFieldNode(EnsoLanguage language, int index, Type type, String name, ModuleScope moduleScope) {
-    super(language, LocalScope.root(), moduleScope, name, null);
+    super(language, LocalScope.empty(), moduleScope, name, null);
     this.index = index;
     this.type = type;
     this.name = name;

diff --git a/...e/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/QualifiedAccessorNode.java b/...e/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/QualifiedAccessorNode.java
@@ -24,7 +24,7 @@ final class QualifiedAccessorNode extends EnsoRootNode {
       EnsoLanguage language, AtomConstructor atomConstructor, ModuleScope moduleScope) {
     super(
         language,
-        LocalScope.root(),
+        LocalScope.empty(),
         moduleScope,
         atomConstructor.getQualifiedName().toString(),
         null);