Merge commit 'd6553ca7499a0bb16593a9402c2cef724ba7fbc0' into import-c…

…hecker # Conflicts: # src/index.ts # src/transpiler/transpiler.ts
source-academy · Feb 1, 2024 · f9e207d · f9e207d
2 parents 6864a5c + d6553ca
commit f9e207d
Show file tree

Hide file tree

Showing 22 changed files with 471 additions and 380 deletions.
diff --git a/src/__tests__/inspect.ts b/src/__tests__/inspect.ts
@@ -30,7 +30,7 @@ xtest('debugger; statement basic test', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -53,7 +53,7 @@ xtest('debugger; statement in function', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -110,7 +110,7 @@ xtest('debugger; statement test function scope', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -136,7 +136,7 @@ xtest('debugger; statement hoisting', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -160,7 +160,7 @@ xtest('debugger; pauses for', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -185,7 +185,7 @@ xtest('debugger; pauses while', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -216,7 +216,7 @@ xtest('setBreakpointAtLine basic', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -241,7 +241,7 @@ xtest('setBreakpointAtLine function 1', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -266,7 +266,7 @@ xtest('setBreakpointAtLine function 2', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -318,7 +318,7 @@ xtest('setBreakpointAtLine function 4', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
   })
 })
@@ -349,12 +349,12 @@ xtest('setBreakpointAtLine granularity 1', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
     return (resume(obj1) as Promise<Result>).then(obj2 => {
       return (resume(obj2) as Promise<Result>).then(obj3 => {
         expect(flattenEnvironments(obj3)).toMatchSnapshot()
-        expect(obj3.status).toBe('suspended-ec-eval')
+        expect(obj3.status).toBe('suspended-cse-eval')
         expect(parseError(context.errors)).toMatchSnapshot()
       })
     })
@@ -384,7 +384,7 @@ xtest('setBreakpointAtLine granularity 2', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
     return (resume(obj1) as Promise<Result>).then(obj2 => {
       expect(flattenEnvironments(obj2)).toMatchSnapshot()
@@ -418,11 +418,11 @@ xtest('setBreakpointAtLine granularity 3', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
     return (resume(obj1) as Promise<Result>).then(obj2 => {
       expect(flattenEnvironments(obj2)).toMatchSnapshot()
-      expect(obj2.status).toBe('suspended-ec-eval')
+      expect(obj2.status).toBe('suspended-cse-eval')
       expect(parseError(context.errors)).toMatchSnapshot()
       return (resume(obj2) as Promise<Result>).then(obj3 => {
         expect(flattenEnvironments(obj3)).toMatchSnapshot()
@@ -454,19 +454,19 @@ xtest('setBreakpointAtLine for loops', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
     return (resume(obj1) as Promise<Result>).then(obj2 => {
       expect(flattenEnvironments(obj2)).toMatchSnapshot()
-      expect(obj2.status).toBe('suspended-ec-eval')
+      expect(obj2.status).toBe('suspended-cse-eval')
       expect(parseError(context.errors)).toMatchSnapshot()
       return (resume(obj2) as Promise<Result>).then(obj3 => {
         expect(flattenEnvironments(obj3)).toMatchSnapshot()
-        expect(obj3.status).toBe('suspended-ec-eval')
+        expect(obj3.status).toBe('suspended-cse-eval')
         expect(parseError(context.errors)).toMatchSnapshot()
         return (resume(obj3) as Promise<Result>).then(obj4 => {
           expect(flattenEnvironments(obj4)).toMatchSnapshot()
-          expect(obj4.status).toBe('suspended-ec-eval')
+          expect(obj4.status).toBe('suspended-cse-eval')
           expect(parseError(context.errors)).toMatchSnapshot()
           return (resume(obj4) as Promise<Result>).then(obj5 => {
             expect(flattenEnvironments(obj5)).toMatchSnapshot()
@@ -501,11 +501,11 @@ xtest('setBreakpointAtLine while loops', () => {
         id: expect.any(String)
       })
     })
-    expect(obj1.status).toBe('suspended-ec-eval')
+    expect(obj1.status).toBe('suspended-cse-eval')
     expect(parseError(context.errors)).toMatchSnapshot()
     return (resume(obj1) as Promise<Result>).then(obj2 => {
       expect(flattenEnvironments(obj2)).toMatchSnapshot()
-      expect(obj2.status).toBe('suspended-ec-eval')
+      expect(obj2.status).toBe('suspended-cse-eval')
       expect(parseError(context.errors)).toMatchSnapshot()
       return (resume(obj2) as Promise<Result>).then(obj5 => {
         expect(flattenEnvironments(obj5)).toMatchSnapshot()

diff --git a/src/createContext.ts b/src/createContext.ts
@@ -104,7 +104,7 @@ const createEmptyRuntime = () => ({
   environments: [],
   value: undefined,
   nodes: [],
-  agenda: null,
+  control: null,
   stash: null,
   envSteps: -1,
   envStepsTotal: 0,

diff --git a/...__snapshots__/ec-evaluator-errors.ts.snap → .../__snapshots__/cse-machine-errors.ts.snap b/...__snapshots__/ec-evaluator-errors.ts.snap → .../__snapshots__/cse-machine-errors.ts.snap
@@ -1029,3 +1029,21 @@ Object {
   "visualiseListResult": Array [],
 }
 `;
+
+exports[`Undefined variables are caught even when unreached: expectParsedError 1`] = `
+Object {
+  "alertResult": Array [],
+  "code": "const a = 1;
+if (false) {
+  im_undefined;
+} else {
+  a;
+}",
+  "displayResult": Array [],
+  "numErrors": 1,
+  "parsedErrors": "Line 3: Name im_undefined not declared.",
+  "result": undefined,
+  "resultStatus": "error",
+  "visualiseListResult": Array [],
+}
+`;
diff --git a/..._/ec-evaluator-return-regressions.ts.snap → ...__/cse-machine-return-regressions.ts.snap b/..._/ec-evaluator-return-regressions.ts.snap → ...__/cse-machine-return-regressions.ts.snap
diff --git a/...__snapshots__/ec-evaluator-stdlib.ts.snap → .../__snapshots__/cse-machine-stdlib.ts.snap b/...__snapshots__/ec-evaluator-stdlib.ts.snap → .../__snapshots__/cse-machine-stdlib.ts.snap
diff --git a/...ests__/__snapshots__/ec-evaluator.ts.snap → ...tests__/__snapshots__/cse-machine.ts.snap b/...ests__/__snapshots__/ec-evaluator.ts.snap → ...tests__/__snapshots__/cse-machine.ts.snap
@@ -1,5 +1,38 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Array literals are unpacked in the correct order: expectResult 1`] = `
+Object {
+  "alertResult": Array [],
+  "code": "let d = 0;
+let c = [ d = d * 10 + 1, d = d * 10 + 2, d = d * 10 + 3];
+d;",
+  "displayResult": Array [],
+  "numErrors": 0,
+  "parsedErrors": "",
+  "result": 123,
+  "resultStatus": "finished",
+  "visualiseListResult": Array [],
+}
+`;
+
+exports[`Array literals work as expected: expectResult 1`] = `
+Object {
+  "alertResult": Array [],
+  "code": "let c = [1, 2, 3];
+c;",
+  "displayResult": Array [],
+  "numErrors": 0,
+  "parsedErrors": "",
+  "result": Array [
+    1,
+    2,
+    3,
+  ],
+  "resultStatus": "finished",
+  "visualiseListResult": Array [],
+}
+`;
+
 exports[`Conditional statements are value producing always: expectResult 1`] = `
 Object {
   "alertResult": Array [],

diff --git a/...valuator/__tests__/ec-evaluator-errors.ts → ...e-machine/__tests__/cse-machine-errors.ts b/...valuator/__tests__/ec-evaluator-errors.ts → ...e-machine/__tests__/cse-machine-errors.ts
@@ -39,6 +39,21 @@ test('Undefined variable error is thrown - verbose', () => {
           `)
 })
 
+const undefinedUnreachedVariable = stripIndent`
+const a = 1;
+if (false) {
+  im_undefined;
+} else {
+  a;
+}
+`
+
+test('Undefined variables are caught even when unreached', () => {
+  return expectParsedError(undefinedUnreachedVariable, optionEC).toMatchInlineSnapshot(
+    `"Line 3: Name im_undefined not declared."`
+  )
+})
+
 test('Undefined variable error message differs from verbose version', () => {
   return expectDifferentParsedErrors(undefinedVariable, undefinedVariableVerbose, optionEC).toBe(
     undefined

diff --git a/...ests__/ec-evaluator-return-regressions.ts → ...tests__/cse-machine-return-regressions.ts b/...ests__/ec-evaluator-return-regressions.ts → ...tests__/cse-machine-return-regressions.ts
diff --git a/...valuator/__tests__/ec-evaluator-stdlib.ts → ...e-machine/__tests__/cse-machine-stdlib.ts b/...valuator/__tests__/ec-evaluator-stdlib.ts → ...e-machine/__tests__/cse-machine-stdlib.ts
diff --git a/src/ec-evaluator/__tests__/ec-evaluator.ts → src/cse-machine/__tests__/cse-machine.ts b/src/ec-evaluator/__tests__/ec-evaluator.ts → src/cse-machine/__tests__/cse-machine.ts
@@ -407,3 +407,30 @@ test('Nullary functions properly restore environment 2', () => {
     optionEC3
   ).toMatchInlineSnapshot(`1`)
 })
+
+test('Array literals work as expected', () => {
+  return expectResult(
+    stripIndent`
+    let c = [1, 2, 3];
+    c;
+    `,
+    optionEC3
+  ).toMatchInlineSnapshot(`
+    Array [
+      1,
+      2,
+      3,
+    ]
+  `)
+})
+
+test('Array literals are unpacked in the correct order', () => {
+  return expectResult(
+    stripIndent`
+    let d = 0;
+    let c = [ d = d * 10 + 1, d = d * 10 + 2, d = d * 10 + 3];
+    d;
+    `,
+    optionEC3
+  ).toMatchInlineSnapshot(`123`)
+})
diff --git a/src/ec-evaluator/instrCreator.ts → src/cse-machine/instrCreator.ts b/src/ec-evaluator/instrCreator.ts → src/cse-machine/instrCreator.ts
@@ -1,5 +1,5 @@
 /**
- * Utility functions for creating the various agenda instructions.
+ * Utility functions for creating the various control instructions.
  */
 
 import * as es from 'estree'