Skip to content

Commit 694cb98

Browse files
authored
Merge branch 'master' into rewrite/stepper
2 parents 9e2f130 + e35223f commit 694cb98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+8405
-10416
lines changed

.github/workflows/nodejs.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,16 @@ jobs:
3232
sudo apt-get install -y --no-install-recommends \
3333
libxi-dev libgl1-mesa-dev \
3434
texlive texlive-fonts-extra texlive-lang-cjk latexmk latex-cjk-all
35+
# Has to be run before actions/setup-node.
36+
# See: https://github.com/actions/setup-node/issues/480
37+
- name: Enable corepack for Yarn
38+
run: corepack enable
3539
- name: Setup Node
3640
uses: actions/setup-node@v4
3741
with:
3842
node-version: 20
3943
cache: yarn
40-
- run: yarn install --frozen-lockfile
44+
- run: yarn install --immutable
4145
- run: yarn build
4246
- run: yarn format:ci
4347
- run: yarn eslint

.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,12 @@ coverage/
1919
*.tsbuildinfo
2020
test-report.html
2121

22+
# yarn files
23+
24+
.yarn/*
25+
!.yarn/patches
26+
!.yarn/plugins
27+
!.yarn/releases
28+
!.yarn/sdks
29+
!.yarn/versions
2230
yarn-error.log

.yarnrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

README.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ You can set additional options:
6464
Usage: js-slang [PROGRAM_STRING] [OPTION]
6565
6666
-c, --chapter=CHAPTER set the Source chapter number (i.e., 1-4) (default: 1)
67-
-v, --variant=VARIANT set the Source variant (i.e., default, interpreter, substituter, typed, lazy, concurrent, wasm, gpu) (default: default)
67+
-v, --variant=VARIANT set the Source variant (i.e., default, interpreter, substituter, typed, concurrent, wasm) (default: default)
6868
-h, --help display this help
6969
-e, --eval don't show REPL, only display output of evaluation
7070
```
@@ -73,12 +73,10 @@ Currently, valid CHAPTER/VARIANT combinations are:
7373

7474
- `--chapter=1 --variant=default`
7575
- `--chapter=1 --variant=wasm`
76-
- `--chapter=1 --variant=lazy`
7776
- `--chapter=1 --variant=substituter`
7877
- `--chapter=1 --variant=interpreter`
7978
- `--chapter=1 --variant=typed`
8079
- `--chapter=2 --variant=default`
81-
- `--chapter=2 --variant=lazy`
8280
- `--chapter=2 --variant=substituter`
8381
- `--chapter=2 --variant=interpreter`
8482
- `--chapter=2 --variant=typed`
@@ -87,7 +85,6 @@ Currently, valid CHAPTER/VARIANT combinations are:
8785
- `--chapter=3 --variant=interpreter`
8886
- `--chapter=3 --variant=typed`
8987
- `--chapter=4 --variant=default`
90-
- `--chapter=4 --variant=gpu`
9188
- `--chapter=4 --variant=interpreter`
9289

9390
Hint: In `bash` you can take the `PROGRAM_STRING` out of a file as follows:

docs/md/README_1_LAZY.md

-43
This file was deleted.

docs/md/README_2_LAZY.md

-45
This file was deleted.

docs/md/README_4_GPU.md

-86
This file was deleted.

docs/md/README_top.md

-12
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,16 @@ the members of our learning community.
2525

2626
### Language variants
2727

28-
#### <a href="source_1_lazy/">Source §1 Lazy</a>
29-
3028
#### <a href="source_1_wasm/">Source §1 WebAssembly</a>
3129

3230
#### <a href="source_1_typed/">Source §1 Typed</a>
3331

34-
#### <a href="source_2_lazy/">Source §2 Lazy</a>
35-
3632
#### <a href="source_2_typed/">Source §2 Typed</a>
3733

3834
#### <a href="source_3_concurrent/">Source §3 Concurrent</a>
3935

4036
#### <a href="source_3_typed/">Source §3 Typed</a>
4137

42-
#### <a href="source_4_gpu/">Source §4 GPU</a>
43-
4438
#### <a href="source_4_typed/">Source §4 Typed</a>
4539

4640
#### <a href="source_4_explicit-control/">Source §4 Explicit-Control</a>
@@ -58,22 +52,16 @@ the Source Academy.
5852

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

61-
#### <a href="source_1_lazy.pdf">Specification of Source §1 Lazy</a>
62-
6355
#### <a href="source_1_wasm.pdf">Specification of Source §1 WebAssembly</a>
6456

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

67-
#### <a href="source_2_lazy.pdf">Specification of Source §2 Lazy</a>
68-
6959
#### <a href="source_2_typed.pdf">Specification of Source §2 Typed</a>
7060

7161
#### <a href="source_3_concurrent.pdf">Specification of Source §3 Concurrent</a>
7262

7363
#### <a href="source_3_typed.pdf">Specification of Source §3 Typed</a>
7464

75-
#### <a href="source_4_gpu.pdf">Specification of Source §4 GPU</a>
76-
7765
#### <a href="source_4_typed.pdf">Specification of Source §4 Typed</a>
7866

7967
#### <a href="source_4_explicitcontrol.pdf">Specification of Source §4 Explicit-Control</a>

docs/specs/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PDFLATEX = latexmk -pdf
22

3-
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
3+
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
44

55
SPECS = $(SPECSNUMS:%=source_%)
66

docs/specs/source_1_lazy.tex

-66
This file was deleted.

0 commit comments

Comments
 (0)