CSE Machine: Fix environment reset instruction insertion (#1542)

* fix environment reset instruction insertion * Update nodejs.yml * remove unneccesary semiclolon in .github/workflows/nodejs.yml Co-authored-by: Richard Dominick <[email protected]> --------- Co-authored-by: Richard Dominick <[email protected]>
source-academy · Feb 18, 2024 · 9f82165 · 9f82165
1 parent 31b262f
commit 9f82165
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/cse-machine/__tests__/__snapshots__/cse-machine.ts.snap b/src/cse-machine/__tests__/__snapshots__/cse-machine.ts.snap
@@ -97,6 +97,19 @@ fact(5);",
 }
 `;
 
+exports[`Environment reset is inserted when only instructions are in control stack: expectResult 1`] = `
+Object {
+  "alertResult": Array [],
+  "code": "const a = (v => v)(0);",
+  "displayResult": Array [],
+  "numErrors": 0,
+  "parsedErrors": "",
+  "result": undefined,
+  "resultStatus": "finished",
+  "visualiseListResult": Array [],
+}
+`;
+
 exports[`Imports are properly handled: expectResult 1`] = `
 Object {
   "alertResult": Array [],

diff --git a/src/cse-machine/__tests__/cse-machine.ts b/src/cse-machine/__tests__/cse-machine.ts
@@ -460,3 +460,12 @@ test('Breaks, continues and returns are detected properly inside loops', () => {
     optionEC3
   ).toMatchInlineSnapshot(`3`)
 })
+
+test('Environment reset is inserted when only instructions are in control stack', () => {
+  return expectResult(
+    stripIndent`
+    const a = (v => v)(0);
+    `,
+    optionEC3
+  ).toMatchInlineSnapshot(`undefined`)
+})
diff --git a/src/cse-machine/interpreter.ts b/src/cse-machine/interpreter.ts
@@ -827,7 +827,7 @@ const cmdEvaluators: { [type: string]: CmdEvaluator } = {
       if (
         next &&
         !(isInstr(next) && next.instrType === InstrType.ENVIRONMENT) &&
-        control.some(isNode)
+        !control.isEmpty()
       ) {
         control.push(instr.envInstr(currentEnvironment(context), command.srcNode))
       }