using inline records

Author: bobzhang

jscomp/core/lam_compile_external_call.ml

@@ -98,8 +98,8 @@ let ocaml_to_js_eff
     match arg_label with
     | Optional label -> 
       Js_of_lam_option.get_default_undefined_from_optional raw_arg
-    | Label (_, None) | Empty -> raw_arg
-    | Label (_, Some _) 
+    | Label {cst = None;_} | Empty -> raw_arg
+    | Label {cst = Some _;_}
     | EmptyCst _
       -> assert false in 
   match arg_type with
@@ -176,16 +176,16 @@ let assemble_args_no_splice call_loc ffi
     | [], _  
       -> assert (args = []) ; empty_pair
     | { arg_label =  EmptyCst cst ; _} :: labels, args 
-    | { arg_label =  Label (_, Some cst); _} :: labels, args -> 
+    | { arg_label =  Label {cst = Some cst;_}; _} :: labels, args -> 
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 
-    | ({arg_label = Empty  | Label (_,None) | Optional _ ;_ } as arg_kind) ::labels,
+    | ({arg_label = Empty  | Label {cst = None;_} | Optional _ ;_ } as arg_kind) ::labels,
        arg :: args
       ->  
         let accs, eff = aux labels args in 
         let acc, new_eff = ocaml_to_js_eff arg_kind arg in 
         append_list acc  accs, Ext_list.append new_eff  eff
-    | { arg_label = Empty  | Label (_,None) | Optional _  ; _ } :: _ , [] 
+    | { arg_label = Empty  | Label {cst = None;_} | Optional _  ; _ } :: _ , [] 
       -> assert false 
   in 
   let args, eff = aux arg_types args  in 
@@ -202,10 +202,10 @@ let assemble_args_has_splice call_loc ffi (arg_types : specs) (args : exprs)
     match labels, args with       
     | [] , _ -> assert (args = []); empty_pair
     | { arg_label =  EmptyCst cst ; _} :: labels  , args 
-    | { arg_label =  Label (_, Some cst); _} :: labels  , args -> 
+    | { arg_label =  Label {cst = Some cst;_}; _} :: labels  , args -> 
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 
-    | ({arg_label = Empty | Label (_,None) | Optional _ ;_ } as arg_kind) ::labels,
+    | ({arg_label = Empty | Label {cst = None;_} | Optional _ ;_ } as arg_kind) ::labels,
       arg :: args
       ->  
       let accs, eff = aux labels args in 
@@ -217,7 +217,7 @@ let assemble_args_has_splice call_loc ffi (arg_types : specs) (args : exprs)
           let acc, new_eff = ocaml_to_js_eff arg_kind arg in 
           append_list acc  accs, Ext_list.append new_eff  eff 
       end
-    | { arg_label = Empty | Label (_,None) | Optional _  ; _ } :: _ , [] 
+    | { arg_label = Empty | Label {cst = None;_} | Optional _  ; _ } :: _ , [] 
       -> assert false 
   in 
   let args, eff = aux arg_types args  in 

jscomp/core/lam_compile_external_obj.ml

@@ -46,7 +46,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
     : (Js_op.property_name * E.t ) list  * J.expression list * _ = 
     match labels, args with 
     | [] , []  ->  [], [], []
-    | {arg_label = Label (label, Some cst )} :: labels  , args -> 
+    | {arg_label = Label {name = label; cst = Some cst }} :: labels  , args -> 
       let accs, eff, assign = aux labels args in 
       (label, Lam_compile_const.translate_arg_cst cst )::accs, eff, assign 
     | {arg_label = EmptyCst _ } :: rest  , args -> assert false 
@@ -55,7 +55,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
       let (accs, eff, assign) as r  = aux labels args in 
       if Js_analyzer.no_side_effect_expression arg then r 
       else (accs, arg::eff, assign)
-    | ({arg_label = Label (label,None)  } as arg_kind)::labels, arg::args 
+    | ({arg_label = Label {name = label; cst = None}  } as arg_kind)::labels, arg::args 
       -> 
       let accs, eff, assign = aux labels args in 
       let acc, new_eff = Lam_compile_external_call.ocaml_to_js_eff arg_kind arg in 
@@ -66,7 +66,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
           (label, x) :: accs , Ext_list.append new_eff  eff , assign          
       end (* evaluation order is undefined *)
 
-    | ({arg_label = Optional label; arg_type } as arg_kind)::labels, arg::args 
+    | ({arg_label = Optional {name = label}; arg_type } as arg_kind)::labels, arg::args 
       -> 
       let (accs, eff, assign) as r = aux labels args  in 
       Js_of_lam_option.destruct_optional arg 
@@ -80,7 +80,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
             (label, x) :: accs , Ext_list.append new_eff  eff , assign
           end )
         ~not_sure:(fun _ -> accs, eff , (arg_kind,arg)::assign )
-    | {arg_label = Empty  | Label (_,None) | Optional _  } :: _ , [] -> assert false 
+    | {arg_label = Empty  | Label {cst = None;_} | Optional _  } :: _ , [] -> assert false 
     | [],  _ :: _  -> assert false 
   in 
   let map, eff, assignment = aux labels args in 
@@ -103,7 +103,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
       (Ext_list.flat_map assignment (fun 
         ((xlabel : External_arg_spec.t), (arg  : J.expression )) -> 
       match xlabel with 
-      | {arg_label = Optional label } -> 
+      | {arg_label = Optional {name = label} } -> 
         (* Need make sure whether assignment is effectful or not
           to avoid code duplication
         *)

jscomp/syntax/external_arg_spec.ml

@@ -33,10 +33,10 @@ type cst =
   | Arg_js_false
   | Arg_js_json of string
 type label = 
-  | Label of string * cst option 
+  | Label of {name : string ; cst : cst option }
   | Empty 
   | EmptyCst of cst 
-  | Optional of string 
+  | Optional of {name : string }
   (* it will be ignored , side effect will be recorded *)
 
 type attr = 
@@ -93,7 +93,7 @@ let cst_int i = Arg_int_lit i
 let cst_string s = Arg_string_lit s 
 let empty_label = Empty 
 let empty_lit s = EmptyCst s
-let label s cst = Label(s,cst)
-let optional s = Optional s 
+let label name cst = Label {name ; cst}
+let optional name = Optional {name}
 
 let empty_kind arg_type = { arg_label = empty_label ; arg_type }

jscomp/syntax/external_arg_spec.mli

@@ -32,10 +32,10 @@ type cst = private
 
 
 type label = private
-  | Label of string * cst option 
+  | Label of {name : string ; cst : cst option }
   | Empty 
   | EmptyCst of cst
-  | Optional of string 
+  | Optional of {name : string}
   (* it will be ignored , side effect will be recorded *)
 
 type attr =