Support OCaml 5.4

Adds support for the OCaml 5.4, mainly versioning the Longident
module and handling migrations of tuples with and without labels.

Signed-off-by: Patrick Ferris <[email protected]>

Author: patricoferris

.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

ast/ast_helper_lite.ml

@@ -16,7 +16,7 @@
 (* TODO: remove this open *)
 open Stdlib0
 module Location = Astlib.Location
-module Longident = Astlib.Longident
+module Longident = Astlib.Legacy_longident
 open Astlib.Ast_502
 
 [@@@warning "-9"]

ast/ast_helper_lite.mli

@@ -21,7 +21,7 @@ open Parsetree
 
 type 'a with_loc = 'a Astlib.Location.loc
 type loc = Astlib.Location.t
-type lid = Astlib.Longident.t with_loc
+type lid = Astlib.Legacy_longident.t with_loc
 type str = string with_loc
 type str_opt = string option with_loc
 type attrs = attribute list

ast/import.ml

@@ -193,7 +193,7 @@ module Asttypes = Selected_ast.Ast.Asttypes
 
 (* Other Astlib modules *)
 module Location = Astlib.Location
-module Longident = Astlib.Longident
+module Longident = Astlib.Legacy_longident
 
 module Parse = struct
   include Astlib.Parse

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_407.ml

@@ -25,6 +25,7 @@
 
          change VERSION for 4.07.0+beta2
 *)
+module Longident = Legacy_longident
 
 module Asttypes = struct
   (** Auxiliary AST types used by parsetree and typedtree. *)

astlib/ast_408.ml

@@ -27,6 +27,7 @@
 
          Actually run all lib-unix tests [4.08]
 *)
+module Longident = Legacy_longident
 
 module Asttypes = struct
 

astlib/ast_409.ml

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

astlib/ast_410.ml

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

astlib/ast_411.ml

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

astlib/ast_412.ml

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

astlib/ast_413.ml

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

astlib/ast_414.ml

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

astlib/ast_501.ml

@@ -1,3 +1,5 @@
+module Longident = Legacy_longident
+
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int

astlib/ast_502.ml

@@ -1,3 +1,4 @@
+module Longident = Legacy_longident
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int

astlib/ast_503.ml

@@ -1,3 +1,4 @@
+module Longident = Legacy_longident
 module Asttypes = struct
   type constant (*IF_CURRENT = Asttypes.constant *) =
       Const_int of int