Remove Interpreter and Testing Refactor

README.md

@@ -64,7 +64,7 @@ You can set additional options:
 Usage: js-slang [PROGRAM_STRING] [OPTION]
 
   -c, --chapter=CHAPTER set the Source chapter number (i.e., 1-4)                                                              (default: 1)
-  -v, --variant=VARIANT set the Source variant (i.e., default, interpreter, substituter, typed, concurrent, wasm) (default: default)
+  -v, --variant=VARIANT set the Source variant (i.e., default, interpreter, substituter, typed, wasm) (default: default)
   -h, --help            display this help
   -e, --eval            don't show REPL, only display output of evaluation
 ```
@@ -81,7 +81,6 @@ Currently, valid CHAPTER/VARIANT combinations are:
 - `--chapter=2 --variant=interpreter`
 - `--chapter=2 --variant=typed`
 - `--chapter=3 --variant=default`
-- `--chapter=3 --variant=concurrent`
 - `--chapter=3 --variant=interpreter`
 - `--chapter=3 --variant=typed`
 - `--chapter=4 --variant=default`

docs/md/README_top.md

@@ -31,8 +31,6 @@ the members of our learning community.
 
 #### <a href="source_2_typed/">Source §2 Typed</a>
 
-#### <a href="source_3_concurrent/">Source §3 Concurrent</a>
-
 #### <a href="source_3_typed/">Source §3 Typed</a>
 
 #### <a href="source_4_typed/">Source §4 Typed</a>
@@ -58,8 +56,6 @@ the Source Academy.
 
 #### <a href="source_2_typed.pdf">Specification of Source §2 Typed</a>
 
-#### <a href="source_3_concurrent.pdf">Specification of Source §3 Concurrent</a>
-
 #### <a href="source_3_typed.pdf">Specification of Source §3 Typed</a>
 
 #### <a href="source_4_typed.pdf">Specification of Source §4 Typed</a>

docs/specs/Makefile

@@ -1,6 +1,6 @@
 PDFLATEX = latexmk -pdf
 
-SPECSNUMS = 1 1_wasm 1_type_inference 1_infinite_loop_detection 1_typed 2 2_typed 3_type_inference 3 3_concurrent 3_typed 4 4_explicitcontrol 4_typed styleguide 2_stepper studio_2 python_1
+SPECSNUMS = 1 1_wasm 1_type_inference 1_infinite_loop_detection 1_typed 2 2_typed 3_type_inference 3 3_typed 4 4_explicitcontrol 4_typed styleguide 2_stepper studio_2 python_1
 
 SPECS = $(SPECSNUMS:%=source_%)
 

eslint.config.mjs

@@ -11,7 +11,7 @@ export default tseslint.config(
   },
   ...tseslint.configs.recommended,
   {
-    files: ['**/*.ts*'],
+    files: ['**/*.ts*', 'scripts/*.mjs'],
     languageOptions: {
       globals: {
         ...globals.node,
@@ -32,6 +32,7 @@ export default tseslint.config(
       'import/order': 'warn',
       '@typescript-eslint/no-base-to-string': 'off', // TODO: Remove
       'prefer-const': 'off', // TODO: Remove
+      'no-constant-condition': ['warn', { checkLoops: false }],
       'no-var': 'off', // TODO: Remove
       '@typescript-eslint/ban-ts-comment': 'warn',
       '@typescript-eslint/ban-types': 'off',

package.json

@@ -50,14 +50,14 @@
     "eslint": "eslint src",
     "format": "prettier --write \"src/**/*.{ts,tsx}\"",
     "format:ci": "prettier --list-different \"src/**/*.{ts,tsx}\"",
-    "test": "jest",
-    "test-coverage": "jest --coverage",
+    "test": "node ./scripts/run_jest.mjs",
+    "test-coverage": "yarn test --coverage",
     "docs": "node ./scripts/docs.mjs docs",
     "jsdoc": "node ./scripts/docs.mjs",
     "autocomplete": "node ./scripts/docs.mjs autocomplete",
-    "build_sicp_package": "./scripts/build_sicp_package.sh",
+    "build_sicp_package": "yarn build && node ./scripts/build_sicp_package.mjs",
     "publish_sicp_package": "./scripts/publish_sicp_package.sh",
-    "benchmark": "jest --runInBand --testPathPattern='.*benchmark.*' --testPathIgnorePatterns='/dist/'",
+    "benchmark": "node ./scripts/run_jest.mjs --runInBand --testPathPattern='.*benchmark.*' --testPathIgnorePatterns='/dist/'",
     "prepare": "husky install"
   },
   "devDependencies": {
@@ -85,6 +85,14 @@
     "typescript": "^4.0.3",
     "typescript-eslint": "^8.8.1"
   },
+  "devEngines": {
+    "packageManager": {
+      "name": "yarn",
+      "version": "^4.6.0",
+      "onFail": "error"
+    }
+  },
+  "packageManager": "[email protected]",
   "jest": {
     "snapshotFormat": {
       "escapeString": true,
@@ -124,7 +132,7 @@
           "includeConsoleLog": true
         }
       ]
-    ]
-  },
-  "packageManager": "[email protected]"
+    ],
+    "prettierPath": null
+  }
 }

scripts/autocomplete.mjs

@@ -12,18 +12,17 @@ const SRC_FILENAME = 'global.html'
 const OUT_DIR = 'src/editors/ace/docTooltip'
 
 const TARGETS = [
-  'source_1',
-  'source_1_wasm',
-  'source_1_typed',
-  'source_2',
-  'source_2_typed',
-  'source_3',
-  'source_3_concurrent',
-  'source_3_typed',
-  'source_4',
-  'source_4_typed',
-  'source_4_explicit-control',
-  'External libraries'
+  "source_1",
+  "source_1_wasm",
+  "source_1_typed",
+  "source_2",
+  "source_2_typed",
+  "source_3",
+  "source_3_typed",
+  "source_4",
+  "source_4_typed",
+  "source_4_explicit-control",
+  "External libraries"
 ]
 
 function newTitleNode(title, document) {