verbose name for readability

Author: bobzhang

jscomp/core/lam_compile_external_call.ml

@@ -97,16 +97,16 @@ let ocaml_to_js_eff
   : arg_expression * E.t list  =
   let arg =
     match arg_label with
-    | Optional  -> 
+    | Arg_optional  -> 
       Js_of_lam_option.get_default_undefined_from_optional raw_arg
-    | Label  | Empty -> raw_arg
+    | Arg_label  | Arg_empty -> raw_arg
   in 
   match arg_type with
   | Arg_cst _ -> assert false 
   | Fn_uncurry_arity _ -> assert false  
   (* has to be preprocessed by {!Lam} module first *)
   | Extern_unit ->  
-    (if arg_label = Empty then 
+    (if arg_label = Arg_empty then 
       Splice0 else Splice1 E.unit), 
     (if Js_analyzer.no_side_effect_expression arg then 
        []
@@ -132,7 +132,7 @@ let ocaml_to_js_eff
   | Unwrap ->
     let single_arg =
       match arg_label with
-      | Optional  ->
+      | Arg_optional  ->
         (**
            If this is an optional arg (like `?arg`), we have to potentially do
            2 levels of unwrapping:
@@ -174,8 +174,8 @@ let assemble_args_no_splice call_loc ffi
     match labels, args with 
     | [], _  
       -> assert (args = []) ; empty_pair
-    | { arg_label =  Empty | Label ; arg_type = Arg_cst cst } :: labels, args 
-      -> 
+    | { arg_type = Arg_cst cst ; _} :: labels, args 
+      -> (* can not be Optional *)
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 
     | {arg_label  ; arg_type } ::labels,
@@ -201,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 =  Empty | Label; arg_type = Arg_cst cst} :: labels  , args 
+    | { arg_type = Arg_cst cst; _} :: labels  , args 
       -> 
       let accs, eff = aux labels args in
       Lam_compile_const.translate_arg_cst cst :: accs, eff 

jscomp/core/lam_compile_external_obj.ml

@@ -58,7 +58,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
     | ({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_label:Label ~arg_type:arg_kind.arg_type arg in 
+      let acc, new_eff = Lam_compile_external_call.ocaml_to_js_eff ~arg_label:Arg_label ~arg_type:arg_kind.arg_type arg in 
       begin match acc with 
         | Splice2 _ 
         | Splice0 -> assert false
@@ -72,7 +72,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
       Js_of_lam_option.destruct_optional arg 
         ~for_sure_none:r 
         ~for_sure_some:(fun x -> let acc, new_eff = Lam_compile_external_call.ocaml_to_js_eff 
-            ~arg_label:Label ~arg_type x in 
+            ~arg_label:Arg_label ~arg_type x in 
           begin match acc with 
           | Splice2 _
           | Splice0 -> assert false 
@@ -112,7 +112,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
           let acc,new_eff = 
             Lam_compile_external_call.ocaml_to_js_eff 
             ~arg_label:
-             Empty ~arg_type:xlabel.arg_type 
+             Arg_empty ~arg_type:xlabel.arg_type 
               (Js_of_lam_option.val_from_option arg) in 
           begin match acc with 
           | Splice1 v  ->                         
@@ -131,7 +131,7 @@ let assemble_obj_args (labels : External_arg_spec.t list)  (args : J.expression
           let acc,new_eff = 
             Lam_compile_external_call.ocaml_to_js_eff 
             ~arg_label:
-             Empty
+             Arg_empty
              ~arg_type:xlabel.arg_type             
               (Js_of_lam_option.val_from_option arg) in 
           begin match acc with 

jscomp/syntax/ast_derive_abstract.ml

@@ -148,7 +148,7 @@ let handleTdcl
                      ["" ; (* Not needed actually*)
                       External_ffi_types.to_string 
                         (Ffi_bs (
-                            [{arg_type = Nothing; arg_label = Empty}],
+                            [{arg_type = Nothing; arg_label = Arg_empty}],
                             Return_identity,
                             Js_get {js_get_name = prim_as_name; js_get_scopes = []}
                           ))] )

jscomp/syntax/ast_external_process.ml

@@ -864,7 +864,7 @@ let handle_attributes
               Location.raise_errorf ~loc:obj.ptyp_loc "[@bs.as] is not supported in bs.send type "
             | _ ->
               (* more error checking *)
-              [{arg_label = Empty; arg_type}],
+              [{arg_label = Arg_empty; arg_type}],
               [{label = Nolabel;
                 ty = new_ty;
                 attr =  [];
@@ -902,22 +902,22 @@ let handle_attributes
                      ~loc
                      "[@@bs.string] does not work with optional when it has arities in label %s" s
                  | _ ->
-                   Optional, arg_type,
+                   Arg_optional, arg_type,
                    param_type :: arg_types end
              | Labelled s  ->
                begin match refine_arg_type ~nolabel:false ty with
                  | new_ty, (Arg_cst _ as arg_type)  ->
-                   Label , arg_type, arg_types
+                   Arg_label , arg_type, arg_types
                  | new_ty, arg_type ->
-                   Label , arg_type, 
+                   Arg_label , arg_type, 
                    {param_type with ty = new_ty} :: arg_types
                end
              | Nolabel ->
                begin match refine_arg_type ~nolabel:true ty with
                  | new_ty , (Arg_cst _ as arg_type) ->
-                   Empty , arg_type,  arg_types
+                   Arg_empty , arg_type,  arg_types
                  | new_ty , arg_type ->
-                   Empty, arg_type, {param_type with ty = new_ty} :: arg_types
+                   Arg_empty, arg_type, {param_type with ty = new_ty} :: arg_types
                end
            in
            ({ arg_label  ;

jscomp/syntax/external_arg_spec.ml

@@ -34,9 +34,9 @@ type cst =
   | Arg_js_json of string
 
 type label_noname = 
-  | Label 
-  | Empty 
-  | Optional
+  | Arg_label 
+  | Arg_empty 
+  | Arg_optional
 
 type label = 
   | Label of {name : string ; cst : cst option }

jscomp/syntax/external_arg_spec.mli

@@ -52,9 +52,9 @@ type attr =
 
 
 type label_noname = 
-  | Label
-  | Empty 
-  | Optional
+  | Arg_label
+  | Arg_empty 
+  | Arg_optional
 
 type t = 
   {