Skip to content

Commit

Permalink
feat(compiler)!: Re-implement Grain parser (#1033)
Browse files Browse the repository at this point in the history
  • Loading branch information
ospencer committed Jan 19, 2022
1 parent af86344 commit 9dc3c96
Show file tree
Hide file tree
Showing 35 changed files with 8,946 additions and 1,086 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ jobs:
run: |
yarn compiler test
- name: Check parser error messages exhaustiveness
run: |
yarn compiler parser:check-errors
# Formatting lint last because building is more important
- name: Run formatting lint
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ js-runner/dist
_esy/
pkg/

# Autogenerated .messages file from Menhir
*.messages.generated

# The grainc.exe binary is copied to the CLI directory during build
cli/bin/grainc.exe
cli/bin/grainc_js.bc.js
Expand Down
9 changes: 2 additions & 7 deletions compiler/dune-project
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(lang dune 2.3)
(name grain)
(version 0.4.6)
(using menhir 2.0)

; Flip this to `true` when we want to generate opam files again
(generate_opam_files false)
Expand All @@ -22,7 +23,6 @@
(dune-build-info (>= 2.0))
(ppx_sexp_conv (>= 0.14.0))
(sexplib (>= 0.14.0))
(grain_dypgen (= 0.1))
(cmdliner (>= 1.0.2))
(grain_utils (>= 0))
(grain_parsing (>= 0))
Expand All @@ -40,7 +40,6 @@
(dune-build-info (>= 2.0))
(ppx_sexp_conv (>= 0.14.0))
(sexplib (>= 0.14.0))
(grain_dypgen (= 0.1))
(binaryen (= 0.9.1))
(cmdliner (>= 1.0.2))
(grain (>= 0))))
Expand Down Expand Up @@ -84,7 +83,6 @@
(reason (>= 3.6.0))
(ppx_sexp_conv (>= 0.14.0))
(sexplib (>= 0.14.0))
(grain_dypgen (= 0.1))
(cmdliner (>= 1.0.2))
(binaryen (= 0.9.1))
(grain_utils (>= 0))
Expand All @@ -97,7 +95,6 @@
(reason (>= 3.6.0))
(ppx_sexp_conv (>= 0.14.0))
(sexplib (>= 0.14.0))
(grain_dypgen (= 0.1))
(cmdliner (>= 1.0.2))
(grain_utils (>= 0))
(grain_parsing (>= 0))
Expand All @@ -110,7 +107,7 @@
(reason (>= 3.6.0))
(ppx_sexp_conv (>= 0.14.0))
(sexplib (>= 0.14.0))
(grain_dypgen (= 0.1))
(menhir (= 20211125))
(cmdliner (>= 1.0.2))
(utf8 (>= 0.0.0))
(ppx_deriving_yojson (>= 3.5.2))
Expand All @@ -124,7 +121,6 @@
(reason (>= 3.6.0))
(ppx_sexp_conv (>= 0.14.0))
(sexplib (>= 0.14.0))
(grain_dypgen (= 0.1))
(ocamlgraph (>= 2.0.0))
(cmdliner (>= 1.0.2))
(ppx_deriving_yojson (>= 3.5.2))
Expand All @@ -139,7 +135,6 @@
(reason (>= 3.6.0))
(ppx_sexp_conv (>= 0.14.0))
(sexplib (>= 0.14.0))
(grain_dypgen (= 0.1))
(fp (>= 0.0.0))
(fs (>= 0.0.0))
(cmdliner (>= 1.0.2))))
Expand Down
2 changes: 1 addition & 1 deletion compiler/esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@opam/dune-configurator": ">= 2.0.0",
"@opam/fp": "0.0.1",
"@opam/fs": "0.0.2",
"@opam/grain_dypgen": "0.2",
"@opam/menhir": "20211125",
"@opam/ocamlgraph": ">= 2.0.0",
"@opam/ppx_deriving_cmdliner": ">= 0.6.0",
"@opam/ppx_deriving_yojson": ">= 3.5.2",
Expand Down
115 changes: 46 additions & 69 deletions compiler/esy.lock/index.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions compiler/esy.lock/opam/grain_dypgen.0.2/files/dypgen.install

This file was deleted.

Loading

0 comments on commit 9dc3c96

Please sign in to comment.