Skip to content

Adapt sedlex-ppx AST generation for OCaml 5.4 #9378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
filipeom wants to merge 2 commits into from
+8 −9
Closed

Adapt sedlex-ppx AST generation for OCaml 5.4 #9378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b669670
Adapt sedlex-ppx AST generation for OCaml 5.4
filipeom Mar 21, 2026
5fc6cfe
Bump min OCaml version to 5.3.0 and js_of_ocaml to 6.3.2
filipeom Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ else
EXE=
endif

SWITCH=ocaml-variants.5.2.0+options
JS_OF_OCAML_VERSION=5.7.2
SWITCH=ocaml-variants.5.3.0+options
JS_OF_OCAML_VERSION=6.3.2
OUNIT_VERSION=2.2.2.6

# set FLOW_RELEASE=[1|true] or CI=true for an optimized build; otherwise,
Expand Down
4 changes: 2 additions & 2 deletions flow_parser.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ license: "MIT"

build: ["dune" "build" "-p" name "-j" jobs]
depends: [
"ocaml" {>= "5.2.0"}
"ocaml" {>= "5.3.0"}
"dune" {>= "3.2"}
"base" {>= "v0.17.1"}
"ppxlib" {>= "0.32.1" & < "0.36.0"}
"ppxlib" {>= "0.37.0"}
"ppx_deriving" {build}
"ppx_gen_rec" {build}
"wtf8"
Expand Down
7 changes: 3 additions & 4 deletions flowtype.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage: "https://flow.org"
doc: "https://flow.org/en/docs/getting-started/"
bug-reports: "https://github.com/facebook/flow/issues"
depends: [
"ocaml" {>= "5.2.0"}
"ocaml" {>= "5.3.0"}
"base" {>= "v0.17.1"}
"base-unix"
"base-bytes"
Expand All @@ -21,9 +21,8 @@ depends: [
"lwt" {>= "5.7.0"}
"lwt_log" {>= "1.1.1"}
"lwt_ppx" {>= "2.1.0"}
"ppxlib" {>= "0.32.1" & < "0.36.0"}
"ppx_expect" {>= "0.17.0"}
"ppx_expect" {>= "0.17.0"}
"ppxlib" {>= "0.37.0"}
"ppx_expect" {>= "v0.17.3"}
"ppx_let" {>= "0.14.0"}
"ppx_deriving" {build}
"ppx_gen_rec" {build}
Expand Down
2 changes: 1 addition & 1 deletion src/third-party/sedlex-ppx/ppx_sedlex.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ let gen_state lexbuf auto i (trans, final) =
(appfun (partition_name partition) [[%expr Sedlexing.__private__next_int [%e evar ~loc lexbuf]]])
(cases @ [case ~lhs:[%pat? _] ~guard:None ~rhs:[%expr Sedlexing.backtrack [%e evar ~loc lexbuf]]])
in
let ret body = [ value_binding ~loc ~pat:(pvar ~loc (state_fun i)) ~expr:(pexp_function ~loc [case ~lhs:(pvar ~loc lexbuf) ~guard:None ~rhs:body]) ] in
let ret body = [ value_binding ~loc ~pat:(pvar ~loc (state_fun i)) ~expr:(pexp_function ~loc [] None (Pfunction_cases ([case ~lhs:(pvar ~loc lexbuf) ~guard:None ~rhs:body], loc, []))) ] in
match best_final final with
| None -> ret (body ())
| Some _ when Array.length trans = 0 -> []
Expand Down
Loading