Merge branch 'source' into csep-machine

Author: s-kybound

README.md

@@ -48,7 +48,7 @@ $ cd dist
 $ npm link
 ```
 
-If you do not wish to add \"js-slang\" to your PATH, replace \"js-slang\" with \"node dist/repl/repl.js\" in the following examples.
+If you do not wish to add \"js-slang\" to your PATH, replace \"js-slang\" with \"node dist/repl\" in the following examples.
 
 To try out _Source_ in a REPL, run
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-slang",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "license": "Apache-2.0",
   "description": "Javascript-based implementations of Source, written in Typescript",
   "keywords": [

src/__tests__/mode.ts

@@ -79,7 +79,7 @@ test('constants are not correctly loaded', () => {
 })
 
 test('operator syntax type error', () => {
-  const code = 'const num = 3; \nnum++; \nnum--; \nnum += 1;'
+  const code = 'const num = 3; \nnum++; \nnum--; \nnum += 1; \n5 + num |2;'
 
   setSession(Chapter.SOURCE_1, defaultVariant, defaultExternal, code)
 
@@ -91,6 +91,15 @@ test('operator syntax type error', () => {
 
   const token3 = session.getTokenAt(3, 5)
   expect(expectedBool(token3, CATEGORY.forbidden)).toBe(true)
+
+  const token4 = session.getTokenAt(4, 1)
+  expect(expectedBool(token4, CATEGORY.number)).toBe(true)
+
+  const token5 = session.getTokenAt(4, 9)
+  expect(expectedBool(token5, CATEGORY.forbidden)).toBe(true)
+
+  const token6 = session.getTokenAt(4, 10)
+  expect(expectedBool(token6, CATEGORY.number)).toBe(true)
 })
 
 test('forbidden keywords', () => {

src/cse-machine/__tests__/__snapshots__/cse-machine-heap.ts.snap

@@ -7467,7 +7467,7 @@ EnvTree {
                       "type": "Literal",
                       "value": [Function],
                     },
-                    "isEnvDependent": true,
+                    "isEnvDependent": false,
                     "loc": undefined,
                     "optional": false,
                     "type": "CallExpression",
@@ -8313,7 +8313,7 @@ EnvTree {
                         "type": "Literal",
                         "value": [Function],
                       },
-                      "isEnvDependent": true,
+                      "isEnvDependent": false,
                       "loc": undefined,
                       "optional": false,
                       "type": "CallExpression",
@@ -9258,7 +9258,7 @@ EnvTree {
                     "type": "Literal",
                     "value": [Function],
                   },
-                  "isEnvDependent": true,
+                  "isEnvDependent": false,
                   "loc": undefined,
                   "optional": false,
                   "type": "CallExpression",
@@ -10222,7 +10222,7 @@ EnvTree {
                 "type": "Literal",
                 "value": [Function],
               },
-              "isEnvDependent": true,
+              "isEnvDependent": false,
               "loc": undefined,
               "optional": false,
               "type": "CallExpression",
@@ -10976,7 +10976,7 @@ EnvTree {
           "type": "Literal",
           "value": [Function],
         },
-        "isEnvDependent": true,
+        "isEnvDependent": false,
         "loc": undefined,
         "optional": false,
         "type": "CallExpression",
@@ -11229,7 +11229,7 @@ EnvTree {
             "type": "Literal",
             "value": [Function],
           },
-          "isEnvDependent": true,
+          "isEnvDependent": false,
           "loc": undefined,
           "optional": false,
           "type": "CallExpression",