Restructure project layout

maolonglong · Jul 27, 2023 · 252650c · 252650c
1 parent 34aaac8
commit 252650c
Show file tree

Hide file tree

Showing 34 changed files with 60 additions and 25 deletions.
diff --git a/.github/workflows/ocaml.yml b/.github/workflows/ocaml.yml
@@ -0,0 +1,36 @@
+name: OCaml
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+        ocaml-compiler:
+          - "4.14"
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout tree
+        uses: actions/checkout@v3
+
+      - name: Set-up OCaml ${{ matrix.ocaml-compiler }}
+        uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+
+      - run: opam install . --deps-only --with-test
+
+      - run: opam exec -- dune build
+
+      - run: opam exec -- dune runtest
diff --git a/Makefile b/Makefile
@@ -19,22 +19,22 @@ test:
 .PHONY: test
 
 examples:
-	dune exec ./main.exe -- ./examples/factorial.bs
-	dune exec ./main.exe -- ./examples/fibonacci.bs
-	dune exec ./main.exe -- ./examples/test_factorial.bs
-	dune exec ./main.exe -- ./examples/test_intdef.bs
-	dune exec ./main.exe -- ./examples/test_lambda.bs
-	dune exec ./main.exe -- ./examples/test_multi.bs
-	dune exec ./main.exe -- ./examples/test_primitives.bs
-	dune exec ./main.exe -- ./examples/test_scoping.bs
-	dune exec ./main.exe -- ./examples/test_my_lib.bs
+	./bs ./examples/factorial.scm
+	./bs ./examples/fibonacci.scm
+	./bs ./examples/test_factorial.scm
+	./bs ./examples/test_intdef.scm
+	./bs ./examples/test_lambda.scm
+	./bs ./examples/test_multi.scm
+	./bs ./examples/test_primitives.scm
+	./bs ./examples/test_scoping.scm
+	./bs ./examples/test_my_lib.scm
 .PHONY: examples
 
 clean:
 	@dune clean
 .PHONY: clean
 
 embed:
-	ocaml-embed-file -output embed ./primitives.bs
+	ocaml-embed-file -output embed -output-dir lib ./primitives.scm
 	dune fmt >/dev/null 2>&1 || true
 .PHONY: embed
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ A subset of [Scheme](https://www.gnu.org/software/mit-scheme/)
 
 ```bash
 # Interprets a file
-$ ./bs ./examples/fibonacci.bs
+$ ./bs ./examples/fibonacci.scm
 0
 1
 1

diff --git a/bin/dune b/bin/dune
@@ -0,0 +1,5 @@
+(executable
+ (name main)
+ (modes byte exe)
+ (modules main)
+ (libraries bogoscheme))
diff --git a/main.ml → bin/main.ml b/main.ml → bin/main.ml
diff --git a/bs b/bs
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 if [ "$(command -v rlwrap)" ]; then
-    rlwrap dune exec ./main.exe -- "$@"
+    rlwrap dune exec ./bin/main.exe -- "$@"
 else
-    dune exec ./main.exe -- "$@"
+    dune exec ./bin/main.exe -- "$@"
 fi
diff --git a/embed.mli b/embed.mli
diff --git a/examples/factorial.bs → examples/factorial.scm b/examples/factorial.bs → examples/factorial.scm
diff --git a/examples/fibonacci.bs → examples/fibonacci.scm b/examples/fibonacci.bs → examples/fibonacci.scm
diff --git a/examples/my_lib.bs → examples/my_lib.scm b/examples/my_lib.bs → examples/my_lib.scm
diff --git a/examples/test_factorial.bs → examples/test_factorial.scm b/examples/test_factorial.bs → examples/test_factorial.scm
diff --git a/examples/test_intdef.bs → examples/test_intdef.scm b/examples/test_intdef.bs → examples/test_intdef.scm
diff --git a/examples/test_lambda.bs → examples/test_lambda.scm b/examples/test_lambda.bs → examples/test_lambda.scm
diff --git a/examples/test_multi.bs → examples/test_multi.scm b/examples/test_multi.bs → examples/test_multi.scm
diff --git a/examples/test_my_lib.bs b/examples/test_my_lib.bs
diff --git a/examples/test_my_lib.scm b/examples/test_my_lib.scm
@@ -0,0 +1,3 @@
+(load "my_lib.scm")
+
+(say-hello)
diff --git a/examples/test_primitives.bs → examples/test_primitives.scm b/examples/test_primitives.bs → examples/test_primitives.scm
diff --git a/examples/test_scoping.bs → examples/test_scoping.scm b/examples/test_scoping.bs → examples/test_scoping.scm
diff --git a/ast.ml → lib/ast.ml b/ast.ml → lib/ast.ml
diff --git a/ast.mli → lib/ast.mli b/ast.mli → lib/ast.mli
diff --git a/dune → lib/dune b/dune → lib/dune
@@ -6,9 +6,3 @@
 (library
  (name bogoscheme)
  (modules ast sexpr parser lexer env eval primitives embed))
-
-(executable
- (name main)
- (modes byte exe)
- (modules main)
- (libraries bogoscheme))
diff --git a/embed.ml → lib/embed.ml b/embed.ml → lib/embed.ml
@@ -1,4 +1,4 @@
-let primitives_dot_bs =
+let primitives_dot_scm =
   "(define not\n\
   \  (lambda (b)\n\
   \    (if b\n\

diff --git a/lib/embed.mli b/lib/embed.mli
@@ -0,0 +1 @@
+val primitives_dot_scm : string
diff --git a/env.ml → lib/env.ml b/env.ml → lib/env.ml
diff --git a/env.mli → lib/env.mli b/env.mli → lib/env.mli
diff --git a/eval.ml → lib/eval.ml b/eval.ml → lib/eval.ml
diff --git a/eval.mli → lib/eval.mli b/eval.mli → lib/eval.mli
diff --git a/lexer.mll → lib/lexer.mll b/lexer.mll → lib/lexer.mll
diff --git a/parser.mly → lib/parser.mly b/parser.mly → lib/parser.mly
diff --git a/primitives.ml → lib/primitives.ml b/primitives.ml → lib/primitives.ml
@@ -129,5 +129,5 @@ let load env =
     ]
   in
   List.iter (fun (op, name) -> Env.add env name (Val_prim op)) ops;
-  load_from_string env Embed.primitives_dot_bs
+  load_from_string env Embed.primitives_dot_scm
 ;;
diff --git a/primitives.mli → lib/primitives.mli b/primitives.mli → lib/primitives.mli
diff --git a/sexpr.ml → lib/sexpr.ml b/sexpr.ml → lib/sexpr.ml
diff --git a/sexpr.mli → lib/sexpr.mli b/sexpr.mli → lib/sexpr.mli
diff --git a/primitives.bs → primitives.scm b/primitives.bs → primitives.scm