CSE Machine: Give prelude environments a separate name (#1596)

* fix prog env creation p2 * Update src/cse-machine/utils.ts Shorten code Co-authored-by: Richard Dominick <[email protected]> * fix-format --------- Co-authored-by: Richard Dominick <[email protected]>
source-academy · Mar 22, 2024 · 650f30d · 650f30d
1 parent c4fc20d
commit 650f30d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/cse-machine/interpreter.ts b/src/cse-machine/interpreter.ts
@@ -60,6 +60,7 @@ import {
   checkStackOverFlow,
   createBlockEnvironment,
   createEnvironment,
+  createProgramEnvironment,
   currentEnvironment,
   declareFunctionsAndVariables,
   declareIdentifier,
@@ -389,7 +390,7 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
   ) {
     // Create and push the environment only if it is non empty.
     if (hasDeclarations(command) || hasImportDeclarations(command)) {
-      const environment = createBlockEnvironment(context, 'programEnvironment')
+      const environment = createProgramEnvironment(context, isPrelude)
       pushEnvironment(context, environment)
       evaluateImports(command as unknown as es.Program, context, {
         wrapSourceModules: true,

diff --git a/src/cse-machine/utils.ts b/src/cse-machine/utils.ts
@@ -312,6 +312,19 @@ export const createBlockEnvironment = (
   }
 }
 
+export const createProgramEnvironment = (
+  context: Context,
+  isPrelude: boolean,
+  head: Frame = {}
+): Environment => {
+  return {
+    name: isPrelude ? 'prelude' : 'programEnvironment',
+    tail: currentEnvironment(context),
+    head,
+    id: uniqueId()
+  }
+}
+
 /**
  * Variables
  */