Consolidate EmptyCst and Empty

Author: bobzhang

jscomp/core/lam_compile_external_call.ml

@@ -100,8 +100,7 @@ let ocaml_to_js_eff
     | Optional  -> 
       Js_of_lam_option.get_default_undefined_from_optional raw_arg
     | Label  | Empty -> raw_arg
-    | EmptyCst 
-      -> assert false in 
+  in 
   match arg_type with
   | Arg_cst _ -> assert false 
   | Fn_uncurry_arity _ -> assert false  
@@ -175,7 +174,7 @@ let assemble_args_no_splice call_loc ffi
     match labels, args with 
     | [], _  
       -> assert (args = []) ; empty_pair
-    | { arg_label =  EmptyCst  ; arg_type = Arg_cst cst } :: labels, args 
+    | { arg_label =  Empty  ; arg_type = Arg_cst cst } :: labels, args 
     | { arg_label =  Label ; arg_type = Arg_cst cst} :: labels, args -> 
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 
@@ -187,8 +186,7 @@ let assemble_args_no_splice call_loc ffi
           ~arg_label ~arg_type arg in 
         append_list acc  accs, Ext_list.append new_eff  eff
     | { arg_label = Empty  | Label | Optional   ; _ } :: _ , [] 
-      -> assert false 
-    | {arg_label = EmptyCst ; _} :: _, _  -> assert false
+      -> assert false     
   in 
   let args, eff = aux arg_types args  in 
   args,
@@ -203,7 +201,7 @@ let assemble_args_has_splice call_loc ffi (arg_types : specs) (args : exprs)
   let rec aux (labels : specs) (args : exprs) = 
     match labels, args with       
     | [] , _ -> assert (args = []); empty_pair
-    | { arg_label =  EmptyCst ; arg_type = Arg_cst cst} :: labels  , args 
+    | { arg_label =  Empty ; arg_type = Arg_cst cst} :: labels  , args 
     | { arg_label =  Label ; arg_type = Arg_cst cst } :: labels  , args -> 
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 
@@ -220,8 +218,7 @@ let assemble_args_has_splice call_loc ffi (arg_types : specs) (args : exprs)
           append_list acc  accs, Ext_list.append new_eff  eff 
       end
     | { arg_label = Empty | Label | Optional   ; _ } :: _ , [] 
-      -> assert false 
-    | {arg_label = EmptyCst ;_ } :: _, _ -> assert false  
+      -> assert false     
   in 
   let args, eff = aux arg_types args  in 
   args,

jscomp/syntax/ast_external_process.ml

@@ -915,7 +915,7 @@ let handle_attributes
              | Nolabel ->
                begin match refine_arg_type ~nolabel:true ty with
                  | new_ty , (Arg_cst _ as arg_type) ->
-                   EmptyCst , arg_type,  arg_types
+                   Empty , arg_type,  arg_types
                  | new_ty , arg_type ->
                    Empty, arg_type, {param_type with ty = new_ty} :: arg_types
                end

jscomp/syntax/external_arg_spec.ml

@@ -36,7 +36,6 @@ type cst =
 type label_noname = 
   | Label 
   | Empty 
-  | EmptyCst
   | Optional
 
 type label = 

jscomp/syntax/external_arg_spec.mli

@@ -54,7 +54,6 @@ type attr =
 type label_noname = 
   | Label
   | Empty 
-  | EmptyCst 
   | Optional
 
 type t =