diff --git a/ast/ast_helper_lite.ml b/ast/ast_helper_lite.ml index 11c6bbf..5f012e9 100644 --- a/ast/ast_helper_lite.ml +++ b/ast/ast_helper_lite.ml @@ -20,7 +20,7 @@ open Ocaml_common module Location = Location module Longident = Longident -open Migrate_parsetree.Ast_411 +open Migrate_parsetree2.Ast_411 [@@@warning "-9"] open Asttypes diff --git a/ast/ast_helper_lite.mli b/ast/ast_helper_lite.mli index 99bdeef..d2678f5 100644 --- a/ast/ast_helper_lite.mli +++ b/ast/ast_helper_lite.mli @@ -16,7 +16,7 @@ (** Copy of Ast_helper from OCaml 4.10 with docstring related stuff removed *) open Ocaml_common -open Migrate_parsetree.Ast_411 +open Migrate_parsetree2.Ast_411 open Asttypes open Parsetree diff --git a/ast/dune b/ast/dune index eefc483..4faecd5 100644 --- a/ast/dune +++ b/ast/dune @@ -9,7 +9,7 @@ ocaml-compiler-libs.shadow ocaml-compiler-libs.common compiler-libs.common - ocaml-migrate-parsetree + ocaml-migrate-parsetree2 stdlib-shims) (flags (:standard -open Ocaml_shadow -safe-string) -w -9-27-32) (preprocess diff --git a/ast/versions.ml b/ast/versions.ml index c1ef2e2..e4fd9bc 100644 --- a/ast/versions.ml +++ b/ast/versions.ml @@ -399,8 +399,8 @@ end (*$ foreach_version (fun n version -> printf "module OCaml_%d = struct\n" n; - printf " module Ast = Migrate_parsetree.Ast_%d\n" n; - printf " include Make_witness(Migrate_parsetree.Ast_%d)\n" n; + printf " module Ast = Migrate_parsetree2.Ast_%d\n" n; + printf " include Make_witness(Migrate_parsetree2.Ast_%d)\n" n; printf " let version = %d\n" n; printf " let string_version = %S\n" version; printf "end\n"; @@ -409,78 +409,78 @@ end ) *) module OCaml_402 = struct - module Ast = Migrate_parsetree.Ast_402 - include Make_witness(Migrate_parsetree.Ast_402) + module Ast = Migrate_parsetree2.Ast_402 + include Make_witness(Migrate_parsetree2.Ast_402) let version = 402 let string_version = "4.02" end let ocaml_402 : OCaml_402.types ocaml_version = (module OCaml_402) module OCaml_403 = struct - module Ast = Migrate_parsetree.Ast_403 - include Make_witness(Migrate_parsetree.Ast_403) + module Ast = Migrate_parsetree2.Ast_403 + include Make_witness(Migrate_parsetree2.Ast_403) let version = 403 let string_version = "4.03" end let ocaml_403 : OCaml_403.types ocaml_version = (module OCaml_403) module OCaml_404 = struct - module Ast = Migrate_parsetree.Ast_404 - include Make_witness(Migrate_parsetree.Ast_404) + module Ast = Migrate_parsetree2.Ast_404 + include Make_witness(Migrate_parsetree2.Ast_404) let version = 404 let string_version = "4.04" end let ocaml_404 : OCaml_404.types ocaml_version = (module OCaml_404) module OCaml_405 = struct - module Ast = Migrate_parsetree.Ast_405 - include Make_witness(Migrate_parsetree.Ast_405) + module Ast = Migrate_parsetree2.Ast_405 + include Make_witness(Migrate_parsetree2.Ast_405) let version = 405 let string_version = "4.05" end let ocaml_405 : OCaml_405.types ocaml_version = (module OCaml_405) module OCaml_406 = struct - module Ast = Migrate_parsetree.Ast_406 - include Make_witness(Migrate_parsetree.Ast_406) + module Ast = Migrate_parsetree2.Ast_406 + include Make_witness(Migrate_parsetree2.Ast_406) let version = 406 let string_version = "4.06" end let ocaml_406 : OCaml_406.types ocaml_version = (module OCaml_406) module OCaml_407 = struct - module Ast = Migrate_parsetree.Ast_407 - include Make_witness(Migrate_parsetree.Ast_407) + module Ast = Migrate_parsetree2.Ast_407 + include Make_witness(Migrate_parsetree2.Ast_407) let version = 407 let string_version = "4.07" end let ocaml_407 : OCaml_407.types ocaml_version = (module OCaml_407) module OCaml_408 = struct - module Ast = Migrate_parsetree.Ast_408 - include Make_witness(Migrate_parsetree.Ast_408) + module Ast = Migrate_parsetree2.Ast_408 + include Make_witness(Migrate_parsetree2.Ast_408) let version = 408 let string_version = "4.08" end let ocaml_408 : OCaml_408.types ocaml_version = (module OCaml_408) module OCaml_409 = struct - module Ast = Migrate_parsetree.Ast_409 - include Make_witness(Migrate_parsetree.Ast_409) + module Ast = Migrate_parsetree2.Ast_409 + include Make_witness(Migrate_parsetree2.Ast_409) let version = 409 let string_version = "4.09" end let ocaml_409 : OCaml_409.types ocaml_version = (module OCaml_409) module OCaml_410 = struct - module Ast = Migrate_parsetree.Ast_410 - include Make_witness(Migrate_parsetree.Ast_410) + module Ast = Migrate_parsetree2.Ast_410 + include Make_witness(Migrate_parsetree2.Ast_410) let version = 410 let string_version = "4.10" end let ocaml_410 : OCaml_410.types ocaml_version = (module OCaml_410) module OCaml_411 = struct - module Ast = Migrate_parsetree.Ast_411 - include Make_witness(Migrate_parsetree.Ast_411) + module Ast = Migrate_parsetree2.Ast_411 + include Make_witness(Migrate_parsetree2.Ast_411) let version = 411 let string_version = "4.11" end let ocaml_411 : OCaml_411.types ocaml_version = (module OCaml_411) module OCaml_412 = struct - module Ast = Migrate_parsetree.Ast_412 - include Make_witness(Migrate_parsetree.Ast_412) + module Ast = Migrate_parsetree2.Ast_412 + include Make_witness(Migrate_parsetree2.Ast_412) let version = 412 let string_version = "4.12" end @@ -489,29 +489,29 @@ let ocaml_412 : OCaml_412.types ocaml_version = (module OCaml_412) (*$foreach_version_pair (fun a b -> printf "include Register_migration(OCaml_%d)(OCaml_%d)\n" a b; - printf " (Migrate_parsetree.Migrate_%d_%d)(Migrate_parsetree.Migrate_%d_%d)\n" a b b a + printf " (Migrate_parsetree2.Migrate_%d_%d)(Migrate_parsetree2.Migrate_%d_%d)\n" a b b a ) *) include Register_migration(OCaml_402)(OCaml_403) - (Migrate_parsetree.Migrate_402_403)(Migrate_parsetree.Migrate_403_402) + (Migrate_parsetree2.Migrate_402_403)(Migrate_parsetree2.Migrate_403_402) include Register_migration(OCaml_403)(OCaml_404) - (Migrate_parsetree.Migrate_403_404)(Migrate_parsetree.Migrate_404_403) + (Migrate_parsetree2.Migrate_403_404)(Migrate_parsetree2.Migrate_404_403) include Register_migration(OCaml_404)(OCaml_405) - (Migrate_parsetree.Migrate_404_405)(Migrate_parsetree.Migrate_405_404) + (Migrate_parsetree2.Migrate_404_405)(Migrate_parsetree2.Migrate_405_404) include Register_migration(OCaml_405)(OCaml_406) - (Migrate_parsetree.Migrate_405_406)(Migrate_parsetree.Migrate_406_405) + (Migrate_parsetree2.Migrate_405_406)(Migrate_parsetree2.Migrate_406_405) include Register_migration(OCaml_406)(OCaml_407) - (Migrate_parsetree.Migrate_406_407)(Migrate_parsetree.Migrate_407_406) + (Migrate_parsetree2.Migrate_406_407)(Migrate_parsetree2.Migrate_407_406) include Register_migration(OCaml_407)(OCaml_408) - (Migrate_parsetree.Migrate_407_408)(Migrate_parsetree.Migrate_408_407) + (Migrate_parsetree2.Migrate_407_408)(Migrate_parsetree2.Migrate_408_407) include Register_migration(OCaml_408)(OCaml_409) - (Migrate_parsetree.Migrate_408_409)(Migrate_parsetree.Migrate_409_408) + (Migrate_parsetree2.Migrate_408_409)(Migrate_parsetree2.Migrate_409_408) include Register_migration(OCaml_409)(OCaml_410) - (Migrate_parsetree.Migrate_409_410)(Migrate_parsetree.Migrate_410_409) + (Migrate_parsetree2.Migrate_409_410)(Migrate_parsetree2.Migrate_410_409) include Register_migration(OCaml_410)(OCaml_411) - (Migrate_parsetree.Migrate_410_411)(Migrate_parsetree.Migrate_411_410) + (Migrate_parsetree2.Migrate_410_411)(Migrate_parsetree2.Migrate_411_410) include Register_migration(OCaml_411)(OCaml_412) - (Migrate_parsetree.Migrate_411_412)(Migrate_parsetree.Migrate_412_411) + (Migrate_parsetree2.Migrate_411_412)(Migrate_parsetree2.Migrate_412_411) (*$*) module OCaml_current = OCaml_OCAML_VERSION diff --git a/ast/versions.mli b/ast/versions.mli index fbc8516..44808d0 100644 --- a/ast/versions.mli +++ b/ast/versions.mli @@ -112,20 +112,20 @@ end (** {1 Concrete frontend instances} *) (*$foreach_version (fun n _ -> - printf "module OCaml_%d : OCaml_version with module Ast = Migrate_parsetree.Ast_%d\n" + printf "module OCaml_%d : OCaml_version with module Ast = Migrate_parsetree2.Ast_%d\n" n n )*) -module OCaml_402 : OCaml_version with module Ast = Migrate_parsetree.Ast_402 -module OCaml_403 : OCaml_version with module Ast = Migrate_parsetree.Ast_403 -module OCaml_404 : OCaml_version with module Ast = Migrate_parsetree.Ast_404 -module OCaml_405 : OCaml_version with module Ast = Migrate_parsetree.Ast_405 -module OCaml_406 : OCaml_version with module Ast = Migrate_parsetree.Ast_406 -module OCaml_407 : OCaml_version with module Ast = Migrate_parsetree.Ast_407 -module OCaml_408 : OCaml_version with module Ast = Migrate_parsetree.Ast_408 -module OCaml_409 : OCaml_version with module Ast = Migrate_parsetree.Ast_409 -module OCaml_410 : OCaml_version with module Ast = Migrate_parsetree.Ast_410 -module OCaml_411 : OCaml_version with module Ast = Migrate_parsetree.Ast_411 -module OCaml_412 : OCaml_version with module Ast = Migrate_parsetree.Ast_412 +module OCaml_402 : OCaml_version with module Ast = Migrate_parsetree2.Ast_402 +module OCaml_403 : OCaml_version with module Ast = Migrate_parsetree2.Ast_403 +module OCaml_404 : OCaml_version with module Ast = Migrate_parsetree2.Ast_404 +module OCaml_405 : OCaml_version with module Ast = Migrate_parsetree2.Ast_405 +module OCaml_406 : OCaml_version with module Ast = Migrate_parsetree2.Ast_406 +module OCaml_407 : OCaml_version with module Ast = Migrate_parsetree2.Ast_407 +module OCaml_408 : OCaml_version with module Ast = Migrate_parsetree2.Ast_408 +module OCaml_409 : OCaml_version with module Ast = Migrate_parsetree2.Ast_409 +module OCaml_410 : OCaml_version with module Ast = Migrate_parsetree2.Ast_410 +module OCaml_411 : OCaml_version with module Ast = Migrate_parsetree2.Ast_411 +module OCaml_412 : OCaml_version with module Ast = Migrate_parsetree2.Ast_412 (*$*) (* An alias to the current compiler version *)