Support OCaml 5.4.0

.github/workflows/trunk-build.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install OCaml compiler
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: 'ocaml-variants.5.3.1+trunk'
+          ocaml-compiler: 'ocaml-variants.5.4.0+trunk'
           dune-cache: true
           cache-prefix: ${{ steps.setup.outputs.cache_prefix }}
 

.ocamlformat-ignore

@@ -2,6 +2,7 @@
 # and therefore must be excluded from the ocamlformat parsing
 astlib/location.ml
 astlib/longident.ml
+astlib/longident.mli
 astlib/astlib.ml
 astlib/ast_402.ml
 astlib/ast_403.ml
@@ -19,6 +20,7 @@ astlib/ast_414.ml
 astlib/ast_501.ml
 astlib/ast_502.ml
 astlib/ast_503.ml
+astlib/ast_504.ml
 
 # Files that use cinaps to generate code blocks from other code blocks work well,
 # but files that inject freely formatted code via cinaps must be excluded

CHANGES.md

@@ -1,6 +1,12 @@
 unreleased
 ----------
 
+### 5.4 Support
+
+- Add initial OCaml 5.4 support (#570, @patricoferris, @NathanReb)
+
+### Other Changes
+
 - Bump ppxlib's AST to 5.3.0 (#558, @patricoferris)
 
 - Fix 5.2 -> 5.3 migration of constants. Those used to always have a `none`

ast/ast.ml

@@ -663,25 +663,30 @@ and type_exception = Parsetree.type_exception = {
 
 and extension_constructor_kind = Parsetree.extension_constructor_kind =
   | Pext_decl of string loc list * constructor_arguments * core_type option
-      (** [Pext_decl(existentials, c_args, t_opt)]
-            describes a new extension constructor. It can be:
-            - [C of T1 * ... * Tn] when:
-                 {ul {- [existentials] is [[]],}
-                     {- [c_args] is [[T1; ...; Tn]],}
-                     {- [t_opt] is [None]}.}
-            - [C: T0] when
-                 {ul {- [existentials] is [[]],}
-                     {- [c_args] is [[]],}
-                     {- [t_opt] is [Some T0].}}
-            - [C: T1 * ... * Tn -> T0] when
-                 {ul {- [existentials] is [[]],}
-                     {- [c_args] is [[T1; ...; Tn]],}
-                     {- [t_opt] is [Some T0].}}
-            - [C: 'a... . T1 * ... * Tn -> T0] when
-                 {ul {- [existentials] is [['a;...]],}
-                     {- [c_args] is [[T1; ... ; Tn]],}
-                     {- [t_opt] is [Some T0].}}
-         *)
+      (** [Pext_decl(existentials, c_args, t_opt)] describes a new extension
+          constructor. It can be:
+          {ul
+           {- [C of T1 * ... * Tn] when:
+              - [existentials] is [[]],
+              - [c_args] is [[T1; ...; Tn]],
+              - [t_opt] is [None]
+           }
+           {- [C: T0] when
+              - [existentials] is [[]],
+              - [c_args] is [[]],
+              - [t_opt] is [Some T0].
+           }
+           {- [C: T1 * ... * Tn -> T0] when
+              - [existentials] is [[]],
+              - [c_args] is [[T1; ...; Tn]],
+              - [t_opt] is [Some T0].
+           }
+           {- [C: 'a... . T1 * ... * Tn -> T0] when
+              - [existentials] is [['a;...]],
+              - [c_args] is [[T1; ... ; Tn]],
+              - [t_opt] is [Some T0].
+           }
+          } *)
   | Pext_rebind of longident_loc
       (** [Pext_rebind(D)] re-export the constructor [D] with the new name [C]
       *)

ast/supported_version/supported_version.ml

@@ -13,6 +13,7 @@ let all =
     (5, 1);
     (5, 2);
     (5, 3);
+    (5, 4);
   ]
 
 let to_string (a, b) =

ast/versions.ml

@@ -647,6 +647,13 @@ module OCaml_503 = struct
   let string_version = "5.3"
 end
 let ocaml_503 : OCaml_503.types ocaml_version = (module OCaml_503)
+module OCaml_504 = struct
+  module Ast = Astlib.Ast_504
+  include Make_witness(Astlib.Ast_504)
+  let version = 504
+  let string_version = "5.4"
+end
+let ocaml_504 : OCaml_504.types ocaml_version = (module OCaml_504)
 (*$*)
 
 let all_versions : (module OCaml_version) list = [
@@ -663,6 +670,7 @@ let all_versions : (module OCaml_version) list = [
 (module OCaml_501 : OCaml_version);
 (module OCaml_502 : OCaml_version);
 (module OCaml_503 : OCaml_version);
+(module OCaml_504 : OCaml_version);
 (*$*)
 ]
 
@@ -691,6 +699,8 @@ include Register_migration(OCaml_501)(OCaml_502)
     (Astlib.Migrate_501_502)(Astlib.Migrate_502_501)
 include Register_migration(OCaml_502)(OCaml_503)
     (Astlib.Migrate_502_503)(Astlib.Migrate_503_502)
+include Register_migration(OCaml_503)(OCaml_504)
+    (Astlib.Migrate_503_504)(Astlib.Migrate_504_503)
 (*$*)
 
 module OCaml_current = OCaml_OCAML_VERSION

ast/versions.mli

@@ -153,6 +153,7 @@ module OCaml_500 : OCaml_version with module Ast = Astlib.Ast_500
 module OCaml_501 : OCaml_version with module Ast = Astlib.Ast_501
 module OCaml_502 : OCaml_version with module Ast = Astlib.Ast_502
 module OCaml_503 : OCaml_version with module Ast = Astlib.Ast_503
+module OCaml_504 : OCaml_version with module Ast = Astlib.Ast_504
 (*$*)
 
 (* An alias to the current compiler version *)

astlib/ast_408.ml

@@ -27,7 +27,6 @@
 
          Actually run all lib-unix tests [4.08]
 *)
-
 module Asttypes = struct
 
   type constant (*IF_CURRENT = Asttypes.constant *) =

astlib/ast_409.ml

@@ -16,7 +16,6 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-
 module Asttypes = struct
 
   type constant (*IF_CURRENT = Asttypes.constant *) =

astlib/ast_410.ml

@@ -16,7 +16,6 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int

astlib/ast_411.ml

@@ -16,7 +16,6 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int

astlib/ast_412.ml

@@ -16,7 +16,6 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int

astlib/ast_413.ml

@@ -16,7 +16,6 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int

astlib/ast_414.ml

@@ -16,7 +16,6 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int