Support for OCaml 5.4

.github/workflows/main.yml

@@ -19,7 +19,8 @@ jobs:
           - "4.14"
           - "5.1"
           - "5.2"
-          - "ocaml-base-compiler.5.3.0~beta2"
+          - "5.3"
+          - "5.4"
 
     runs-on: ${{ matrix.os }}
 

Makefile

@@ -1,6 +1,6 @@
 .PHONY: init
 init:
-	opam switch create . 5.3.0 --no-install -y
+	opam switch create . 5.4.0 --no-install -y
 	opam install . --deps-only -y
 	opam install menhir.20201216 ocamlformat ocaml-lsp-server -y
 

mlx/dune

@@ -2,8 +2,17 @@
  (name pp)
  (package mlx)
  (public_name mlx-pp)
+ (modules :standard \ mlx_shim)
  (flags
-  (:standard -w -9-67 -open Astlib.Ast_501))
+  (:standard -w -9-67 -open Astlib -open Astlib.Ast_501 -open Mlx_shim))
+ (libraries ppxlib ocaml-compiler-libs.shadow mlx_shim))
+
+(library
+ (name mlx_shim)
+ (package mlx)
+ (modules mlx_shim)
+ (flags
+  (:standard -w -9-67 -open Astlib -open Astlib.Ast_501))
  (libraries ppxlib ocaml-compiler-libs.shadow))
 
 (ocamllex lexer)

mlx/jsx_helper.ml

@@ -11,7 +11,6 @@ let make_loc (startpos, endpos) =
     Location.loc_ghost = false;
   }
 
-let mkloc txt loc = { Location.txt; loc }
 let mkexp ~loc d = Exp.mk ~loc:(make_loc loc) d
 
 let mkjsxexp ~loc:loc' e =
@@ -63,7 +62,7 @@ let make_jsx_element ~raise ~loc:_ ~tag ~end_tag ~props ~children () =
   in
   let props =
     let prop_exp ~loc name =
-      let id = mkloc (Lident name) (make_loc loc) in
+      let id = Location.mkloc (Lident name) (make_loc loc) in
       mkexp ~loc (Pexp_ident id)
     in
     List.map

mlx/mlx_shim.ml

@@ -0,0 +1,21 @@
+module Pprintast = struct
+  include Pprintast
+
+  let tyvar = Compiler_pprintast.tyvar
+end
+
+module Location = struct
+  include Location
+
+  let mkloc txt loc = { Location.txt; loc }
+  let mknoloc txt = { Location.txt; loc = Location.none }
+end
+
+module Longident = struct
+  include Longident
+
+  let last = function
+    | Lident s -> s
+    | Ldot (_, s) -> s
+    | Lapply (_, _) -> Misc.fatal_error "Longident.last"
+end

mlx/pp.ml

@@ -29,7 +29,8 @@ let () =
   match str with
   | Ok str ->
       let str = Conv.copy_structure str in
-      if !print_ml then Format.printf "%a@." Pprintast.structure str
+      if !print_ml then
+        Format.printf "%a@." Compiler_pprintast.structure str
       else
         let oc = stdout in
         output_string oc

ocamlmerlin_mlx/ocaml/preprocess/jsx_helper.ml

@@ -12,7 +12,6 @@ let make_loc (startpos, endpos) =
     Location.loc_ghost = false;
   }
 
-let mkloc txt loc = { Location.txt; loc }
 let mkexp ~loc d = Exp.mk ~loc:(make_loc loc) d
 
 let mkjsxexp ~loc:loc' e =
@@ -64,7 +63,7 @@ let make_jsx_element ~raise ~loc:_ ~tag ~end_tag ~props ~children () =
   in
   let props =
     let prop_exp ~loc name =
-      let id = mkloc (Lident name) (make_loc loc) in
+      let id = Location.mkloc (Lident name) (make_loc loc) in
       mkexp ~loc (Pexp_ident id)
     in
     List.map