split obj_label

Author: bobzhang

jscomp/core/lam_compile_external_obj.ml

@@ -46,7 +46,7 @@ let assemble_obj_args (labels : External_arg_spec.obj_params)  (args : J.express
     : (Js_op.property_name * E.t ) list  * J.expression list * _ = 
     match labels, args with 
     | [] , []  ->  [], [], []
-    | {obj_arg_label = Obj_label {name = label; cst = Some cst }} :: labels  , args -> 
+    | {obj_arg_label = Obj_labelCst {name = label; cst }} :: labels  , args -> 
       let accs, eff, assign = aux labels args in 
       (label, Lam_compile_const.translate_arg_cst cst )::accs, eff, assign 
     (* | {obj_arg_label = EmptyCst _ } :: rest  , args -> assert false  *)
@@ -55,7 +55,7 @@ let assemble_obj_args (labels : External_arg_spec.obj_params)  (args : J.express
       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)
-    | ({obj_arg_label = Obj_label {name = label; cst = None}  } as arg_kind)::labels, arg::args 
+    | ({obj_arg_label = Obj_label {name = label;}  } 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_label:Arg_label ~arg_type:arg_kind.obj_arg_type arg in 
@@ -80,7 +80,7 @@ let assemble_obj_args (labels : External_arg_spec.obj_params)  (args : J.express
             (label, x) :: accs , Ext_list.append new_eff  eff , assign
           end )
         ~not_sure:(fun _ -> accs, eff , (arg_kind,arg)::assign )
-    | {obj_arg_label = Obj_empty  | Obj_label {cst = None;_} | Obj_optional _  } :: _ , [] -> assert false 
+    | {obj_arg_label = Obj_empty  | Obj_label _ | Obj_optional _  } :: _ , [] -> assert false 
     | [],  _ :: _  -> assert false 
   in 
   let map, eff, assignment = aux labels args in 

jscomp/syntax/external_arg_spec.ml

@@ -39,7 +39,8 @@ type label_noname =
   | Arg_optional
 
 type label = 
-  | Obj_label of {name : string ; cst : cst option }
+  | Obj_label of {name : string }
+  | Obj_labelCst of {name : string ; cst : cst}
   | Obj_empty 
   | Obj_optional of {name : string }
   (* it will be ignored , side effect will be recorded *)
@@ -106,7 +107,13 @@ let cst_int i = Arg_int_lit i
 let cst_string s = Arg_string_lit s 
 let empty_label = Obj_empty 
 
-let label name cst = Obj_label {name ; cst}
+let label name cst = 
+  match cst with
+  | None ->  
+    Obj_label {name }
+  | Some cst ->
+    Obj_labelCst {name ; cst}   
+    
 let optional name = Obj_optional {name}
 
 let empty_kind obj_arg_type = { obj_arg_label = empty_label ; obj_arg_type }

jscomp/syntax/external_arg_spec.mli

@@ -32,7 +32,8 @@ type cst = private
 
 
 type label = private
-  | Obj_label of {name : string ; cst : cst option }
+  | Obj_label of {name : string}
+  | Obj_labelCst of {name : string ; cst : cst}
   | Obj_empty 
 
   | Obj_optional of {name : string}