make module_id a separate type

bobzhang · bobzhang · commit c530c33eec2e · 2020-08-24T17:16:09.000+08:00
Note we can not move its definition out of sources of J.ml which will break the code generation for o#ident
diff --git a/jscomp/core/j.ml b/jscomp/core/j.ml
@@ -63,7 +63,7 @@ and exports = Js_op.exports
 
 and tag_info = Js_op.tag_info 
  
-and required_modules = Js_op.required_modules
+and required_modules = module_id list
 
 
 
@@ -75,10 +75,12 @@ and required_modules = Js_op.required_modules
 and property_name =  Js_op.property_name
 and jsint = Js_op.jsint
 and ident = Ident.t 
-
+and module_id = {
+  id : ident; kind : Js_op.kind
+}
 and vident = 
   | Id of ident
-  | Qualified of ident * kind * string option
+  | Qualified of module_id * string option
     (* Since camldot is only available for toplevel module accessors,
        we don't need print  `A.length$2`
        just print `A.length` - it's guarateed to be unique
diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
@@ -526,14 +526,14 @@ and loop_case_clauses  :  'a . cxt ->
 
 and vident cxt f  (v : J.vident) =
   match v with
-  | Id v | Qualified(v, _, None) ->
+  | Id v | Qualified({id  = v }, None) ->
     Ext_pp_scope.ident cxt f v
-  | Qualified (id, (Ml | Runtime),  Some name) ->
+  | Qualified ({id; kind = Ml | Runtime},  Some name) ->
     let cxt = Ext_pp_scope.ident cxt f id in
     P.string f L.dot;
     P.string f (Ext_ident.convert  name);
     cxt
-  | Qualified (id, External _, Some name) ->
+  | Qualified ({id; kind = External _}, Some name) ->
     let cxt = Ext_pp_scope.ident cxt f id in
     Js_dump_property.property_access f name ;
     cxt
@@ -958,7 +958,7 @@ and expression_desc cxt ~(level:int) f x : cxt  =
 and property_name_and_value_list cxt f (l : J.property_map) =     
   iter_lst cxt f l (fun cxt f (pn,e) -> 
       match e.expression_desc with  
-      | Var (Id v | Qualified (v,_,None)) -> 
+      | Var (Id v | Qualified ({id =v; _},None)) -> 
         let key = Js_dump_property.property_key pn in 
         let str, cxt = Ext_pp_scope.str_of_ident cxt v in 
         let content = 
diff --git a/jscomp/core/js_exp_make.ml b/jscomp/core/js_exp_make.ml
@@ -89,12 +89,12 @@ let flat_call ?comment e0 es : t =
 
 let runtime_var_dot ?comment (x : string)  (e1 : string) : J.expression = 
   { expression_desc = 
-     Var (Qualified(Ident.create_persistent x,Runtime, Some e1));
+     Var (Qualified({id = Ident.create_persistent x; kind = Runtime}, Some e1));
     comment }
 
 
 let ml_var_dot ?comment ( id  : Ident.t) e : J.expression =     
-  {expression_desc = Var (Qualified(id, Ml, Some e)); comment }
+  {expression_desc = Var (Qualified({id; kind = Ml}, Some e)); comment }
 
 (** 
    module as a value 
@@ -103,15 +103,15 @@ let ml_var_dot ?comment ( id  : Ident.t) e : J.expression =
    ]}
 *)
 let external_var_field ?comment  ~external_name:name (id : Ident.t)  ~dot : t = 
-  {expression_desc = Var (Qualified(id, External name,  Some dot)); comment }
+  {expression_desc = Var (Qualified({id; kind = External name},  Some dot)); comment }
 
 
 let external_var ?comment ~external_name (id : Ident.t) : t =   
   {expression_desc = 
-    Var (Qualified(id, External external_name,  None)); comment }
+    Var (Qualified({id; kind = External external_name},  None)); comment }
 
 let ml_module_as_var ?comment (id : Ident.t) : t  = 
-  {expression_desc = Var (Qualified (id, Ml, None)); comment}
+  {expression_desc = Var (Qualified ({id; kind = Ml}, None)); comment}
 
 (* Static_index .....................**)        
 let runtime_call ?comment module_name fn_name args = 
@@ -971,23 +971,23 @@ let rec int_comp (cmp : Lam_compat.comparison) ?comment  (e0 : t) (e1 : t) =
   | _, Call ({
       expression_desc = 
         Var (Qualified 
-               (_, Runtime, 
+               ({kind = Runtime}, 
                 Some ("caml_int_compare" | "caml_int32_compare"))); _}, 
       [l;r], _), 
     Number (Int {i = 0l})
     -> int_comp cmp l r (* = 0 > 0 < 0 *)
   | Ceq, Call ({
       expression_desc = 
         Var (Qualified 
-               (ident, Runtime, 
+               ({id = _; kind = Runtime} as iid, 
                 Some ("caml_compare"))); _} as fn, 
       ([_;_] as args), call_info), 
     Number (Int {i = 0l})
     -> 
       {e0 with expression_desc =
          Call( 
             {fn with expression_desc = 
-              Var(Qualified (ident,Runtime, Some "caml_equal")) 
+              Var(Qualified (iid, Some "caml_equal")) 
             } , args, call_info)}
   | Ceq, Optional_block _,  Undefined
   | Ceq, Undefined, Optional_block _
diff --git a/jscomp/core/js_fold.ml b/jscomp/core/js_fold.ml
@@ -37,10 +37,9 @@ class virtual fold =
     method vident : vident -> 'self_type =
       function
       | Id _x -> let o = o#ident _x in o
-      | Qualified (_x, _x_i1, _x_i2) ->
-          let o = o#ident _x in
-          let o = o#kind _x_i1 in
-          let o = o#option (fun o -> o#string) _x_i2 in o
+      | Qualified (_x, _x_i1) ->
+          let o = o#module_id _x in
+          let o = o#option (fun o -> o#string) _x_i1 in o
     method variable_declaration : variable_declaration -> 'self_type =
       fun { ident = _x; value = _x_i1; property = _x_i2; ident_info = _x_i3 }
         ->
@@ -297,7 +296,8 @@ class virtual fold =
       fun { statement_desc = _x; comment = _x_i1 } ->
         let o = o#statement_desc _x in
         let o = o#option (fun o -> o#string) _x_i1 in o
-    method required_modules : required_modules -> 'self_type = o#unknown
+    method required_modules : required_modules -> 'self_type =
+      o#list (fun o -> o#module_id)
     method property_name : property_name -> 'self_type = o#unknown
     method property_map : property_map -> 'self_type =
       o#list
@@ -310,6 +310,9 @@ class virtual fold =
         let o = o#exports _x_i1 in let o = o#unknown _x_i2 in o
     method number : number -> 'self_type = o#unknown
     method mutable_flag : mutable_flag -> 'self_type = o#unknown
+    method module_id : module_id -> 'self_type =
+      fun { id = _x; kind = _x_i1 } ->
+        let o = o#ident _x in let o = o#unknown _x_i1 in o
     method length_object : length_object -> 'self_type = o#unknown
     method label : label -> 'self_type = o#string
     method kind : kind -> 'self_type = o#unknown
diff --git a/jscomp/core/js_fold_basic.ml b/jscomp/core/js_fold_basic.ml
@@ -56,8 +56,8 @@ class count_hard_dependencies =
     val hard_dependencies =  create 17
     method! vident vid = 
       match vid with 
-      | Qualified (id,kind,_) ->
-          add_lam_module_ident  hard_dependencies (Lam_module_ident.mk kind id); self
+      | Qualified (vid,_) ->
+          add_lam_module_ident  hard_dependencies vid; self
       | Id _ -> 
         self
     method! expression x : 'self_type  = 
diff --git a/jscomp/core/js_map.ml b/jscomp/core/js_map.ml
@@ -40,11 +40,10 @@ class virtual map =
     method vident : vident -> vident =
       function
       | Id _x -> let _x = o#ident _x in Id _x
-      | Qualified (_x, _x_i1, _x_i2) ->
-          let _x = o#ident _x in
-          let _x_i1 = o#kind _x_i1 in
-          let _x_i2 = o#option (fun o -> o#string) _x_i2
-          in Qualified (_x, _x_i1, _x_i2)
+      | Qualified (_x, _x_i1) ->
+          let _x = o#module_id _x in
+          let _x_i1 = o#option (fun o -> o#string) _x_i1
+          in Qualified (_x, _x_i1)
     method variable_declaration :
       variable_declaration -> variable_declaration =
       fun { ident = _x; value = _x_i1; property = _x_i2; ident_info = _x_i3 }
@@ -316,7 +315,7 @@ class virtual map =
         let _x_i1 = o#option (fun o -> o#string) _x_i1
         in { statement_desc = _x; comment = _x_i1; }
     method required_modules : required_modules -> required_modules =
-      o#unknown
+      o#list (fun o -> o#module_id)
     method property_name : property_name -> property_name = o#unknown
     method property_map : property_map -> property_map =
       o#list
@@ -332,6 +331,10 @@ class virtual map =
         in { block = _x; exports = _x_i1; export_set = _x_i2; }
     method number : number -> number = o#unknown
     method mutable_flag : mutable_flag -> mutable_flag = o#unknown
+    method module_id : module_id -> module_id =
+      fun { id = _x; kind = _x_i1 } ->
+        let _x = o#ident _x in
+        let _x_i1 = o#unknown _x_i1 in { id = _x; kind = _x_i1; }
     method length_object : length_object -> length_object = o#unknown
     method label : label -> label = o#string
     method kind : kind -> kind = o#unknown
diff --git a/jscomp/core/js_op.ml b/jscomp/core/js_op.ml
@@ -229,9 +229,7 @@ type ident_info = {
 
 type exports = Ident.t list 
 
-type module_id = { id : Ident.t; kind  : kind}
 
-type required_modules = module_id list
 
 
 type tag_info = Lam_tag_info.t
diff --git a/jscomp/core/js_op_util.ml b/jscomp/core/js_op_util.ml
@@ -136,7 +136,7 @@ let same_str_opt ( x : string option  ) (y : string option) =
 let same_vident (x : J.vident) (y : J.vident) = 
   match x, y with 
   | Id x0, Id y0 -> Ident.same x0 y0
-  | Qualified(x0,k0,str_opt0), Qualified(y0,k1,str_opt1) -> 
+  | Qualified({id = x0; kind = k0},str_opt0), Qualified({id = y0; kind = k1},str_opt1) -> 
       Ident.same x0 y0 && same_kind k0 k1 && same_str_opt str_opt0 str_opt1
   | Id _, Qualified _ 
   | Qualified _, Id _ -> false
diff --git a/jscomp/core/lam_module_ident.ml b/jscomp/core/lam_module_ident.ml
@@ -30,7 +30,7 @@
 
 
 
-type t = Js_op.module_id = 
+type t = J.module_id = 
   { id : Ident.t ; kind : Js_op.kind }
 
 
@@ -43,8 +43,6 @@ let of_external id name =  {id ; kind = External name}
 
 let of_runtime id = { id ; kind = Runtime }
 
-let mk kind id = {id; kind}
-
 let name  (x : t) : string  = 
   match x.kind  with 
   | Ml  | Runtime ->  x.id.name
diff --git a/jscomp/core/lam_module_ident.mli b/jscomp/core/lam_module_ident.mli
@@ -35,8 +35,9 @@
 (** A type for qualified identifiers in Lambda IR 
  *)
 
-type t = Js_op.module_id = 
-  private {
+
+type t = J.module_id = 
+  (*private*) {
   id : Ident.t ; 
   kind : Js_op.kind 
   }
@@ -46,7 +47,7 @@ val id : t -> Ident.t
 
 val name : t -> string
 
-val mk : Js_op.kind -> Ident.t -> t
+
 
 val of_ml : Ident.t -> t
 
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
diff --git a/lib/4.06.1/unstable/native_ppx.ml b/lib/4.06.1/unstable/native_ppx.ml
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
