Add abstract Version.t type to Astlib.

Author: ceastlund

ast/cinaps/gen_builder.ml

@@ -277,8 +277,8 @@ let builders name (grammar : Astlib.Grammar.kind) shortcut =
 let print_builder_ml () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.define_modules grammars ~f:(fun version grammar ->
-    let version = Ml.module_name version in
+  Ml.define_modules' (module Astlib.Version) grammars ~f:(fun version grammar ->
+    let version = Ml.module_name (Astlib.Version.to_string version) in
     Print.println "open Versions.%s" version;
     let shortcut =
       let m = lazy (Shortcut.Map.from_grammar grammar) in
@@ -291,8 +291,8 @@ let print_builder_ml () =
 let print_builder_mli () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.declare_modules grammars ~f:(fun version grammar ->
-    let version = Ml.module_name version in
+  Ml.declare_modules' (module Astlib.Version) grammars ~f:(fun version grammar ->
+    let version = Ml.module_name (Astlib.Version.to_string version) in
     let shortcut =
       let m = lazy (Shortcut.Map.from_grammar grammar) in
       fun name -> Shortcut.Map.find (Lazy.force m) name

ast/cinaps/gen_conversion.ml

@@ -19,11 +19,11 @@ let type_name name ~view =
   match view with
   | `ast ->
     Printf.sprintf "Versions.%s.%s.t"
-      (Ml.module_name version)
+      (Ml.module_name (Astlib.Version.to_string version))
       (Ml.module_name name)
   | `concrete ->
     Printf.sprintf "Versions.%s.%s.concrete"
-      (Ml.module_name version)
+      (Ml.module_name (Astlib.Version.to_string version))
       (Ml.module_name name)
   | `parsetree ->
     Printf.sprintf "Compiler_types.%s" (Ml.id name)
@@ -245,7 +245,7 @@ let print_conversion_impl decl ~node_name ~env ~is_initial =
       (Name.make ["ast_of"; node_name] (Poly_env.args env));
     Print.indented (fun () ->
       Print.println "Versions.%s.%s.%s (%s x)"
-        (Ml.module_name version)
+        (Ml.module_name (Astlib.Version.to_string version))
         (Ml.module_name node_name)
         "of_concrete"
         (Name.make ["concrete_of"; node_name] (Poly_env.args env)));
@@ -255,7 +255,7 @@ let print_conversion_impl decl ~node_name ~env ~is_initial =
     Print.println "and %s x =" (Name.make ["ast_to"; node_name] (Poly_env.args env));
     Print.indented (fun () ->
       Print.println "let option = Versions.%s.%s.%s x in"
-        (Ml.module_name version)
+        (Ml.module_name (Astlib.Version.to_string version))
         (Ml.module_name node_name)
         "to_concrete";
       Print.println "let concrete =";

ast/cinaps/gen_traverse.ml

@@ -562,17 +562,17 @@ let define_virtual_traversal_classes grammar =
 let print_virtual_traverse_ml () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.define_modules grammars ~f:(fun version grammar ->
-    let version = Ml.module_name version in
+  Ml.define_modules' (module Astlib.Version) grammars ~f:(fun version grammar ->
+    let version = Ml.module_name (Astlib.Version.to_string version) in
     Print.println "open Versions.%s" version;
     To_concrete.define_conversion_failed ~version;
     define_virtual_traversal_classes grammar)
 
 let print_virtual_traverse_mli () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.declare_modules grammars ~f:(fun version grammar ->
-    Print.println "open Versions.%s" (Ml.module_name version);
+  Ml.declare_modules' (module Astlib.Version) grammars ~f:(fun version grammar ->
+    Print.println "open Versions.%s" (Ml.module_name (Astlib.Version.to_string version));
     declare_virtual_traversal_classes grammar)
 
 let inherits ~params ~class_name ~version =
@@ -594,17 +594,17 @@ let traversal_class ~impl ~traversal:{params; class_name; complete; _} ~version
 let print_traverse_ml () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.define_modules grammars ~f:(fun version _ ->
-    let version = Ml.module_name version in
+  Ml.define_modules' (module Astlib.Version) grammars ~f:(fun version _ ->
+    let version = Ml.module_name (Astlib.Version.to_string version) in
     List.iteri traversal_classes ~f:(fun i traversal ->
       if i <> 0 then Print.newline ();
       traversal_class ~impl:true ~traversal ~version))
 
 let print_traverse_mli () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.declare_modules grammars ~f:(fun version _ ->
-    let version = Ml.module_name version in
+  Ml.declare_modules' (module Astlib.Version) grammars ~f:(fun version _ ->
+    let version = Ml.module_name (Astlib.Version.to_string version) in
     List.iteri traversal_classes ~f:(fun i traversal ->
       if i <> 0 then Print.newline ();
       traversal_class ~impl:false ~traversal ~version))

ast/cinaps/gen_versions.ml

@@ -407,7 +407,7 @@ let print_versions_mli () =
   let grammars = Astlib.History.versioned_grammars Astlib.history in
   print_ast_types grammars;
   Print.newline ();
-  Ml.declare_modules grammars ~f:(fun _ grammar ->
+  Ml.declare_modules' (module Astlib.Version) grammars ~f:(fun _ grammar ->
     Ml.declare_modules grammar ~recursive:true ~f:(fun node_name kind ->
       match (kind : Astlib.Grammar.kind) with
       | Mono decl ->
@@ -420,8 +420,10 @@ let print_versions_ml () =
   let grammars = Astlib.History.versioned_grammars Astlib.history in
   print_ast_types grammars;
   Print.newline ();
-  Ml.define_modules grammars ~f:(fun version grammar ->
-    Print.println "let version = %S" version;
+  Ml.define_modules' (module Astlib.Version) grammars ~f:(fun version grammar ->
+    Print.println
+      "let version = Astlib.Version.of_string %S"
+      (Astlib.Version.to_string version);
     Print.println "let node name data = Node.of_node ~version { name; data }";
     Print.newline ();
     Ml.define_modules grammar ~f:(fun node_name kind ->

ast/cinaps/gen_viewer.ml

@@ -164,9 +164,9 @@ let print_viewer ~what ~shortcuts (name, kind) =
 let print_viewer_ml () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.define_modules grammars ~f:(fun version grammar ->
+  Ml.define_modules' (module Astlib.Version) grammars ~f:(fun version grammar ->
     let shortcuts = Shortcut.Map.from_grammar grammar in
-    let version = Ml.module_name version in
+    let version = Ml.module_name (Astlib.Version.to_string version) in
     Print.println "open Versions.%s" version;
     Print.println "include Loc_types";
     To_concrete.define_conversion_failed ~version;
@@ -175,9 +175,9 @@ let print_viewer_ml () =
 let print_viewer_mli () =
   Print.newline ();
   let grammars = Astlib.History.versioned_grammars Astlib.history in
-  Ml.declare_modules grammars ~f:(fun version grammar ->
+  Ml.declare_modules' (module Astlib.Version) grammars ~f:(fun version grammar ->
     let shortcuts = Shortcut.Map.from_grammar grammar in
     Print.println "open Versions";
-    Print.println "open %s" (Ml.module_name version);
+    Print.println "open %s" (Ml.module_name (Astlib.Version.to_string version));
     Print.println "include LOC_TYPES";
     List.iter grammar ~f:(print_viewer ~what:`Intf ~shortcuts))

ast/cinaps/ml.ml

@@ -33,7 +33,20 @@ let dotted ~id string =
     (dotted_list ~id
        (String.split_on_char ~sep:'.' string))
 
-let print_modules ?(recursive = false) alist ~signature ~f =
+module type To_string = sig
+  type t
+
+  val to_string : t -> string
+end
+
+let print_modules
+      (type a)
+      (module Name : To_string with type t = a)
+      ?(recursive = false)
+      alist
+      ~signature
+      ~f
+  =
   List.iteri alist ~f:(fun i (name, x) ->
     if i > 0 then Print.newline ();
     Print.println "%s %s %s"
@@ -42,13 +55,28 @@ let print_modules ?(recursive = false) alist ~signature ~f =
          then "module rec"
          else "and"
        else "module")
-      (module_name name)
+      (module_name (Name.to_string name))
       (if signature then ": sig" else "= struct");
     Print.indented (fun () -> f name x);
     Print.println "end")
 
-let declare_modules = print_modules ~signature:true
-let define_modules = print_modules ~signature:false
+let declare_modules' m ?recursive alist ~f =
+  print_modules m ~signature:true ?recursive alist ~f
+
+let define_modules' m ?recursive alist ~f =
+  print_modules m ~signature:false ?recursive alist ~f
+
+module Str = struct
+  type t = string
+
+  let to_string (t : t) = t
+end
+
+let declare_modules ?recursive alist ~f =
+  declare_modules' (module Str) ?recursive alist ~f
+
+let define_modules ?recursive alist ~f =
+  define_modules' (module Str) ?recursive alist ~f
 
 let declare_module name print_body =
   declare_modules [(name, print_body)] ~f:(fun _ f -> f ())

ast/cinaps/ml.mli

@@ -28,6 +28,26 @@ val declare_modules
   -> f:(string -> 'a -> unit)
   -> unit
 
+module type To_string = sig
+  type t
+
+  val to_string : t -> string
+end
+
+val define_modules'
+  :  (module To_string with type t = 'a)
+  -> ?recursive:bool
+  -> ('a * 'b) list
+  -> f:('a -> 'b -> unit)
+  -> unit
+
+val declare_modules'
+  :  (module To_string with type t = 'a)
+  -> ?recursive:bool
+  -> ('a * 'b) list
+  -> f:('a -> 'b -> unit)
+  -> unit
+
 val print_record_type : (string * 'a) list -> f:('a -> string) -> unit
 
 val print_array : 'a list -> f:(int -> 'a -> string) -> unit

ast/node.ml

@@ -1,4 +1,4 @@
-type t = { version : string; node : t Astlib.Ast.node }
+type t = { version : Astlib.Version.t; node : t Astlib.Ast.node }
 
 let version t = t.version
 

ast/node.mli

@@ -1,5 +1,5 @@
 type t
 
-val version : t -> string
-val of_node : t Astlib.Ast.node -> version:string -> t
-val to_node : t -> version:string -> t Astlib.Ast.node
+val version : t -> Astlib.Version.t
+val of_node : t Astlib.Ast.node -> version:Astlib.Version.t -> t
+val to_node : t -> version:Astlib.Version.t -> t Astlib.Ast.node

ast/test/cinaps/ppx_ast_tests_cinaps.ml

@@ -298,7 +298,7 @@ let print_test name ~version =
           Print.indented (fun () ->
             Print.println
               "((new Traverse.%s.map)#%s"
-              (Ml.module_name version)
+              (Ml.module_name (Astlib.Version.to_string version))
               (Ml.id name);
             Print.indented (fun () ->
               Print.println
@@ -312,7 +312,7 @@ let print_test_ml () =
   Print.println "let config = { Test.default_config with test_count = 1_000 }";
   List.iter alist ~f:(fun (version, grammar) ->
     Print.newline ();
-    Ml.define_module version (fun () ->
+    Ml.define_module (Astlib.Version.to_string version) (fun () ->
       let have_printed = ref false in
       List.iter grammar ~f:(fun (name, kind) ->
         match (kind : Astlib.Grammar.kind) with