Skip to content

Commit

Permalink
Replace camlp5 with ppx_parser (#11860)
Browse files Browse the repository at this point in the history
* Use ppx_parser instead of camlp5

* Port camlp5 parser to ppx_parser

* Add git url for ppx_parser

* Replace instances of Stream.Error ""

ppx_parser's default message is "Parse error."

* Remove unnecessarily added match expression

This previously did not have a match expression and it is not necessary

* remove some [%s s] noise

---------

Co-authored-by: Simon Krajewski <[email protected]>
  • Loading branch information
tobil4sk and Simn authored Dec 11, 2024
1 parent 2ecf485 commit a9d7988
Show file tree
Hide file tree
Showing 5 changed files with 682 additions and 684 deletions.
7 changes: 5 additions & 2 deletions haxe.opam
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,22 @@ build: [
install: [make "install" "INSTALL_DIR=%{prefix}%"]
remove: [make "uninstall" "INSTALL_DIR=%{prefix}%"]
depends: [
("ocaml" {>= "5.0"} & ("camlp5" {build}))
| ("ocaml" {>= "4.08" & < "5.0"} & ("camlp5" {build & = "8.00.03"}))
"ocaml"
"ocamlfind" {build}
"dune" {>= "1.11" & < "3.16"}
"sedlex" {>= "2.0"}
"xml-light"
"extlib" {>= "1.7.8"}
"sha"
"camlp-streams"
"ppx_parser"
"conf-libpcre2-8"
"conf-zlib"
"conf-neko"
"luv" {>= "0.5.13"}
"ipaddr"
"terminal_size"
]
pin-depends: [
["ppx_parser.dev" "git+https://github.com/tobil4sk/ppx_parser#relax-ocaml-constraint"]
]
1 change: 1 addition & 0 deletions src/dune
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
(modules (:standard \ haxe))
(preprocess (per_module
((pps sedlex.ppx) json lexer)
((pps ppx_parser) grammar)
))
(wrapped false)
)
Expand Down
5 changes: 0 additions & 5 deletions src/syntax/dune

This file was deleted.

Loading

0 comments on commit a9d7988

Please sign in to comment.