Refactor: list explicitly all the possible xxxfoo delimiters in a variant.

#5522

Author: cristianoc

jscomp/core/j.ml

@@ -76,6 +76,7 @@ and for_ident = ident
 and for_direction = Js_op.direction_flag
 and property_map = (property_name * expression) list
 and length_object = Js_op.length_object
+and delim = | Nothing | J | JS | StarJ | Json
 
 and expression_desc =
   | Length of expression * length_object
@@ -135,7 +136,7 @@ and expression_desc =
       return_unit : bool;
       async : bool;
     }
-  | Str of { delim : string option; txt : string }
+  | Str of { delim : delim; txt : string }
   (* A string is UTF-8 encoded, and may contain
      escape sequences.
   *)

jscomp/core/js_dump.ml

@@ -597,9 +597,9 @@ and expression_desc cxt ~(level : int) f x : cxt =
       (*TODO --
          when utf8-> it will not escape '\\' which is definitely not we want
       *)
-      if delim = Some "j" || delim = Some "*j" then
+      if delim = J || delim = StarJ then
         P.string f ("\"" ^ txt ^ "\"")
-      else if delim = Some "json" then P.string f txt
+      else if delim = Json then P.string f txt
       else Js_dump_string.pp_string f txt;
       cxt
   | Raw_js_code { code = s; code_info = info } -> (

jscomp/core/js_exp_make.ml

@@ -123,7 +123,7 @@ let pure_runtime_call module_name fn_name args =
 
 let runtime_ref module_name fn_name = runtime_var_dot module_name fn_name
 
-let str ?(delim = None) ?comment txt : t =
+let str ?(delim = J.Nothing) ?comment txt : t =
   { expression_desc = Str { txt; delim }; comment }
 
 let raw_js_code ?comment info s : t =
@@ -487,7 +487,7 @@ let array_length ?comment (e : t) : t =
 
 let string_length ?comment (e : t) : t =
   match e.expression_desc with
-  | Str { txt; delim = None } -> int ?comment (Int32.of_int (String.length txt))
+  | Str { txt; delim = Nothing } -> int ?comment (Int32.of_int (String.length txt))
   (* No optimization for {j||j}*)
   | _ -> { expression_desc = Length (e, String); comment }
 

jscomp/core/js_exp_make.mli

@@ -82,7 +82,7 @@ val pure_runtime_call :
 
 val runtime_ref : string -> string -> t
 
-val str : ?delim: string option -> ?comment: string -> string -> t
+val str : ?delim: J.delim -> ?comment: string -> string -> t
 
 val ocaml_fun :
   ?comment:string ->

jscomp/core/lam_compile_const.ml

@@ -71,7 +71,7 @@ and translate (x : Lam_constant.t) : J.expression =
       (* https://github.com/google/closure-library/blob/master/closure%2Fgoog%2Fmath%2Flong.js *)
   | Const_float f -> E.float f (* TODO: preserve float *)
   | Const_string { s; unicode = false } -> E.str s
-  | Const_string { s; unicode = true } -> E.str ~delim:(Some "j") s
+  | Const_string { s; unicode = true } -> E.str ~delim:J s
   | Const_pointer name -> E.str name
   | Const_block (tag, tag_info, xs) ->
       Js_of_lam_block.make_block NA tag_info (E.small_int tag)

jscomp/frontend/ast_attributes.ml

@@ -23,9 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 type attr = Parsetree.attribute
-
 type t = attr list
-
 type ('a, 'b) st = { get : 'a option; set : 'b option }
 
 let process_method_attributes_rev (attrs : t) =
@@ -164,14 +162,13 @@ let is_inline : attr -> bool =
 let has_inline_payload (attrs : t) = Ext_list.find_first attrs is_inline
 
 let is_await : attr -> bool =
-  fun ({ txt }, _) -> txt = "await" || txt = "res.await"
+ fun ({ txt }, _) -> txt = "await" || txt = "res.await"
 
 let is_async : attr -> bool =
-  fun ({ txt }, _) -> txt = "async" || txt = "res.async"
+ fun ({ txt }, _) -> txt = "async" || txt = "res.async"
 
 let has_await_payload (attrs : t) = Ext_list.find_first attrs is_await
 let has_async_payload (attrs : t) = Ext_list.find_first attrs is_async
- 
 
 type derive_attr = { bs_deriving : Ast_payload.action list option } [@@unboxed]
 
@@ -281,10 +278,16 @@ let iter_process_bs_int_as (attrs : t) =
       | _ -> ());
   !st
 
-type as_const_payload = Int of int | Str of string * string option
+type as_const_payload = Int of int | Str of string * J.delim
 
 let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
   let st = ref None in
+  let process_delim = function
+    | None -> Some J.Nothing
+    | Some "json" -> Some Json
+    | Some "*j" -> Some StarJ
+    | _ -> None
+  in
   Ext_list.iter attrs (fun (({ txt; loc }, payload) as attr) ->
       match txt with
       | "bs.as" | "as" ->
@@ -300,32 +303,34 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                           Pstr_eval
                             ( {
                                 pexp_desc =
-                                  Pexp_constant
-                                    (Pconst_string
-                                      (s, ((None | Some "json"| Some "*j") as delim)));
+                                  Pexp_constant (Pconst_string (s, delim_));
                                 pexp_loc;
                                 _;
                               },
                               _ );
                         _;
                       };
                     ]
-                     ->
+                  when process_delim delim_ <> None -> (
+                    let delim =
+                      match process_delim delim_ with
+                      | None -> assert false
+                      | Some delim -> delim
+                    in
                     st := Some (Str (s, delim));
-                    if delim = Some "json" then (
+                    if delim = Json then
                       (* check that it is a valid object literal *)
                       match
-                         Classify_function.classify
-                           ~check:
-                             (pexp_loc, Bs_flow_ast_utils.flow_deli_offset delim)
-                           s
-                       with
+                        Classify_function.classify
+                          ~check:
+                            (pexp_loc, Bs_flow_ast_utils.flow_deli_offset delim_)
+                          s
+                      with
                       | Js_literal _ -> ()
                       | _ ->
                           Location.raise_errorf ~loc:pexp_loc
-                            "an object literal expected"
-                    )
-                | _ -> Bs_syntaxerr.err loc (Expect_int_or_string_or_json_literal)
+                            "an object literal expected")
+                | _ -> Bs_syntaxerr.err loc Expect_int_or_string_or_json_literal
                 )
             | Some v -> st := Some (Int v))
           else Bs_syntaxerr.err loc Duplicated_bs_as

jscomp/frontend/ast_attributes.mli

@@ -58,7 +58,7 @@ val has_bs_optional : t -> bool
 
 val iter_process_bs_int_as : t -> int option
 
-type as_const_payload = Int of int | Str of string * string option
+type as_const_payload = Int of int | Str of string * J.delim
 val iter_process_bs_string_or_int_as : t -> as_const_payload option
 
 val process_derive_type : t -> derive_attr * t

jscomp/frontend/external_arg_spec.ml

@@ -26,7 +26,7 @@
 
 type cst =
   | Arg_int_lit of int
-  | Arg_string_lit of string * string option
+  | Arg_string_lit of string * J.delim
 
 type label_noname = Arg_label | Arg_empty | Arg_optional
 

jscomp/frontend/external_arg_spec.mli

@@ -24,7 +24,7 @@
 
 type cst = private
   | Arg_int_lit of int
-  | Arg_string_lit of string * string option
+  | Arg_string_lit of string * J.delim
 
 type attr =
   | Poly_var_string of { descr : (string * string) list }
@@ -56,7 +56,7 @@ type params = param list
 
 val cst_int : int -> cst
 
-val cst_string : string -> string option -> cst
+val cst_string : string -> J.delim -> cst
 
 val empty_label : label