Skip to content

Commit

Permalink
Upgrade Parser to 4.08 AST and add 4.08 features (#2487)
Browse files Browse the repository at this point in the history
* Upgrade Parser to 4.08 AST and add 4.08 features

* fix exception tests

* Support alphanumeric characters in the monadic syntax (#1)

* Fix tests, add '.' and '!' to kwdopchar (#2)

Back in the "async await" discussions in reason land, there were vigorous proponents of both the "let." and "let!", so I figure I might as well add them here :)

* newline, really?

* fix test

* Backport `letop` monadic let syntax to pre-4.08 (making it bucklescript compatible!) (#3)

* fix some warnings

* apply mappers when printing to AST and ML

* fix binding ops interaction with comment chars

* Set correct location end position in letop binding parsing

* Add test for @supriyo's fix

* Fix syntax util for new AST

* pin dune to 1.x

* update lock files

Co-authored-by: Jared Forsyth <jabapyth@gmail.com>
Co-authored-by: Supriyo Sinha <supriyo@typeish.net>
Co-authored-by: Sikan He <sikanhe@users.noreply.github.com>
  • Loading branch information
4 people committed Feb 20, 2020
1 parent b5d0df9 commit 84cf723
Show file tree
Hide file tree
Showing 64 changed files with 1,538 additions and 979 deletions.
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -17,6 +17,7 @@ test: build clean-tests
dune build src/reason-parser-tests/testOprint.exe
# ./miscTests/rtopIntegrationTest.sh
./miscTests/jsxPpxTest.sh
./miscTests/backportSyntaxTests.sh
cd formatTest; ./test.sh

.PHONY: coverage
Expand Down
2 changes: 1 addition & 1 deletion esy.json
Expand Up @@ -12,7 +12,7 @@
"@opam/merlin-extend": " >= 0.4",
"@opam/result": "*",
"@opam/ocaml-migrate-parsetree": "*",
"@opam/dune": "*"
"@opam/dune": "< 2.0.0"
},
"devDependencies": {
"@opam/merlin": "*",
Expand Down
341 changes: 169 additions & 172 deletions esy.lock/index.json

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions esy.lock/opam/charInfo_width.1.1.0/opam

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.

15 changes: 0 additions & 15 deletions esy.lock/opam/jbuilder.transition/opam

This file was deleted.

38 changes: 0 additions & 38 deletions esy.lock/opam/js_of_ocaml-compiler.3.5.1/opam

This file was deleted.

33 changes: 0 additions & 33 deletions esy.lock/opam/js_of_ocaml.3.5.1/opam

This file was deleted.

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

10 changes: 5 additions & 5 deletions esy.lock/opam/lwt.4.4.0/opam → esy.lock/opam/lwt.5.1.1/opam

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

70 changes: 0 additions & 70 deletions esy.lock/opam/merlin.3.3.2/opam

This file was deleted.

37 changes: 0 additions & 37 deletions esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam

This file was deleted.

29 changes: 18 additions & 11 deletions esy.lock/opam/odoc.1.4.2/opam → esy.lock/opam/odoc.1.5.0/opam

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

0 comments on commit 84cf723

Please sign in to comment.