Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ jobs:
sudo apt-get install -y --no-install-recommends \
libxi-dev libgl1-mesa-dev \
texlive texlive-fonts-extra texlive-lang-cjk latexmk latex-cjk-all
# Has to be run before actions/setup-node.
# See: https://github.com/actions/setup-node/issues/480
- name: Enable corepack for Yarn
run: corepack enable
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
cache: yarn
- run: yarn install --frozen-lockfile
- run: yarn install --immutable
- run: yarn build
- run: yarn format:ci
- run: yarn eslint
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,12 @@ coverage/
*.tsbuildinfo
test-report.html

# yarn files

.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
yarn-error.log
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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, lazy, concurrent, wasm, gpu) (default: default)
-v, --variant=VARIANT set the Source variant (i.e., default, interpreter, substituter, typed, concurrent, wasm, gpu) (default: default)
-h, --help display this help
-e, --eval don't show REPL, only display output of evaluation
```
Expand All @@ -73,12 +73,10 @@ Currently, valid CHAPTER/VARIANT combinations are:

- `--chapter=1 --variant=default`
- `--chapter=1 --variant=wasm`
- `--chapter=1 --variant=lazy`
- `--chapter=1 --variant=substituter`
- `--chapter=1 --variant=interpreter`
- `--chapter=1 --variant=typed`
- `--chapter=2 --variant=default`
- `--chapter=2 --variant=lazy`
- `--chapter=2 --variant=substituter`
- `--chapter=2 --variant=interpreter`
- `--chapter=2 --variant=typed`
Expand Down
43 changes: 0 additions & 43 deletions docs/md/README_1_LAZY.md

This file was deleted.

45 changes: 0 additions & 45 deletions docs/md/README_2_LAZY.md

This file was deleted.

4 changes: 0 additions & 4 deletions docs/md/README_top.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,10 @@ the Source Academy.

#### <a href="source_4.pdf">Specification of Source §4</a>

#### <a href="source_1_lazy.pdf">Specification of Source §1 Lazy</a>

#### <a href="source_1_wasm.pdf">Specification of Source §1 WebAssembly</a>

#### <a href="source_1_typed.pdf">Specification of Source §1 Typed</a>

#### <a href="source_2_lazy.pdf">Specification of Source §2 Lazy</a>

#### <a href="source_2_typed.pdf">Specification of Source §2 Typed</a>

#### <a href="source_3_concurrent.pdf">Specification of Source §3 Concurrent</a>
Expand Down
2 changes: 1 addition & 1 deletion docs/specs/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PDFLATEX = latexmk -pdf

SPECSNUMS = 1 1_lazy 1_wasm 1_type_inference 1_infinite_loop_detection 1_typed 2 2_lazy 2_typed 3_type_inference 3 3_concurrent 3_typed 4 4_explicitcontrol 4_gpu 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_concurrent 3_typed 4 4_explicitcontrol 4_gpu 4_typed styleguide 2_stepper studio_2 python_1

SPECS = $(SPECSNUMS:%=source_%)

Expand Down
66 changes: 0 additions & 66 deletions docs/specs/source_1_lazy.tex

This file was deleted.

74 changes: 0 additions & 74 deletions docs/specs/source_2_lazy.tex

This file was deleted.

9 changes: 2 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
"files": [
"dist"
],
"bin": {
"js-slang": "dist/repl/index.js"
},
"bin": "dist/repl/index.js",
"dependencies": {
"@babel/parser": "^7.19.4",
"@commander-js/extra-typings": "^12.0.1",
Expand All @@ -47,9 +45,6 @@
"lodash": "^4.17.21",
"source-map": "0.7.3"
},
"resolutions": {
"**/gl": "^8.1.6"
},
"scripts": {
"build": "yarn docs && yarn build:slang",
"build:slang": "tsc --project tsconfig.prod.json",
Expand Down Expand Up @@ -130,5 +125,5 @@
]
]
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
"packageManager": "yarn@4.6.0"
}
18 changes: 0 additions & 18 deletions scripts/docs.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ const configs = {
"math.js"
]
},
"Source §1 Lazy": {
"readme": "README_1_LAZY.md",
"dst": "source_1_lazy/",
"libs": [
"misc.js",
"math.js"
]
},
"Source §1 Typed": {
"readme": "README_1_TYPED.md",
"dst": "source_1_typed/",
Expand All @@ -56,16 +48,6 @@ const configs = {
"list.js"
]
},
"Source §2 Lazy": {
"readme": "README_2_LAZY.md",
"dst": "source_2_lazy/",
"libs": [
"auxiliary.js",
"misc.js",
"math.js",
"list.js"
]
},
"Source §2 Typed": {
"readme": "README_2_TYPED.md",
"dst": "source_2_typed/",
Expand Down
Loading
Loading