minor change in while loops to be consistent with for loops (#1491)

source-academy · Sep 29, 2023 · 24e9ce7 · 24e9ce7
1 parent f82bd10
commit 24e9ce7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/ec-evaluator/interpreter.ts b/src/ec-evaluator/interpreter.ts
@@ -372,7 +372,7 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
     }
     agenda.push(instr.whileInstr(command.test, command.body, command))
     agenda.push(command.test)
-    stash.push(undefined) // Return undefined if there is no loop execution
+    agenda.push(ast.identifier('undefined', command.loc)) // Return undefined if there is no loop execution
   },
 
   ForStatement: function (command: es.ForStatement, context: Context, agenda: Agenda) {
@@ -816,7 +816,8 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
       if (
         next &&
         !(isInstr(next) && next.instrType === InstrType.ENVIRONMENT) &&
-        args.length !== 0
+        args.length !== 0 &&
+        agenda.some(isNode)
       ) {
         agenda.push(instr.envInstr(currentEnvironment(context), command.srcNode))
       }

diff --git a/src/ec-evaluator/utils.ts b/src/ec-evaluator/utils.ts
@@ -58,6 +58,10 @@ export class Stack<T> implements IStack<T> {
     // return a copy of the stack's contents
     return [...this.storage]
   }
+
+  public some(predicate: (value: T) => boolean): boolean {
+    return this.storage.some(predicate)
+  }
 }
 
 /**