Skip to content
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

Add support for OCaml 5.3 #813

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for OCaml 5.3 #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eliom.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ depends: [
"ocamlfind"
"ppx_deriving"
"ppxlib" {>= "0.15.0"}
"js_of_ocaml-compiler" {>= "5.5.0" & < "6.0.0"}
"js_of_ocaml-compiler" {>= "5.5.0"}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to stay for now

"js_of_ocaml" {>= "5.5.0"}
"js_of_ocaml-lwt" {>= "5.5.0"}
"js_of_ocaml-ocamlbuild" {build}
Expand Down
9 changes: 9 additions & 0 deletions src/ppx/ppx_eliom_utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,18 @@ module Cmo = struct
in
type_of_out_type ty

[%%if ocaml_version >= (5, 3, 0)]
let typ ty =
let ty =
Out_type.prepare_for_printing [ty];
Out_type.tree_of_typexp Type_scheme ty
in
type_of_out_type ty
[%%else]
let typ ty =
let ty = Printtyp.tree_of_type_scheme ty in
type_of_out_type ty
[%%endif]

let find err loc =
let {Lexing.pos_fname; pos_cnum; _} = loc.Location.loc_start in
Expand Down
Loading