Refactor: remove Const_unicode.

Author: cristianoc

jscomp/core/lam.ml

@@ -638,7 +638,7 @@ let rec eval_const_as_bool (v : Lam_constant.t) : bool =
   | Const_js_false | Const_js_null | Const_module_alias | Const_js_undefined ->
       false
   | Const_js_true | Const_string _ | Const_pointer _ | Const_float _
-  | Const_unicode _ | Const_block _ | Const_float_array _ ->
+  | Const_block _ | Const_float_array _ ->
       true
   | Const_some b -> eval_const_as_bool b
 

jscomp/core/lam_analysis.ml

@@ -197,7 +197,6 @@ and size_constant x =
   | Const_js_null | Const_js_undefined | Const_module_alias | Const_js_true
   | Const_js_false ->
       1
-  | Const_unicode _ (* TODO: this seems to be not good heurisitives*)
   | Const_string _ ->
       1
   | Const_some s -> size_constant s

jscomp/core/lam_compile_const.ml

@@ -72,7 +72,6 @@ and translate (x : Lam_constant.t) : J.expression =
   | 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_unicode i -> E.str ~delim:(Some "j") i
   | 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/core/lam_constant.ml

@@ -44,7 +44,6 @@ type t =
   | Const_int of { i : int32; comment : pointer_info }
   | Const_char of char
   | Const_string of { s : string; unicode : bool }
-  | Const_unicode of string
   | Const_float of string
   | Const_int64 of int64
   | Const_pointer of string
@@ -69,8 +68,6 @@ let rec eq_approx (x : t) (y : t) =
       match y with
       | Const_string { s = sy; unicode = uy } -> sx = sy && ux = uy
       | _ -> false)
-  | Const_unicode ix -> (
-      match y with Const_unicode iy -> ix = iy | _ -> false)
   | Const_float ix -> ( match y with Const_float iy -> ix = iy | _ -> false)
   | Const_int64 ix -> ( match y with Const_int64 iy -> ix = iy | _ -> false)
   | Const_pointer ix -> (

jscomp/core/lam_constant.mli

@@ -40,7 +40,6 @@ type t =
   | Const_int of { i : int32; comment : pointer_info }
   | Const_char of char
   | Const_string of { s : string; unicode : bool }
-  | Const_unicode of string
   | Const_float of string
   | Const_int64 of int64
   | Const_pointer of string

jscomp/core/lam_eta_conversion.ml

@@ -42,7 +42,7 @@ let transform_under_supply n ap_info fn args =
         match lam with
         | Lvar _
         | Lconst
-            ( Const_int _ | Const_char _ | Const_string _ | Const_unicode _ | Const_float _
+            ( Const_int _ | Const_char _ | Const_string _ | Const_float _
             | Const_int64 _ | Const_pointer _ | Const_js_true | Const_js_false
             | Const_js_undefined )
         | Lprim { primitive = Pfield (_, Fld_module _); _ }

jscomp/core/lam_print.ml

@@ -23,7 +23,6 @@ let rec struct_const ppf (cst : Lam_constant.t) =
   | Const_int { i } -> fprintf ppf "%ld" i
   | Const_char c -> fprintf ppf "%C" c
   | Const_string { s } -> fprintf ppf "%S" s
-  | Const_unicode s -> fprintf ppf "%S" s
   | Const_float f -> fprintf ppf "%s" f
   | Const_int64 n -> fprintf ppf "%LiL" n
   | Const_pointer name -> fprintf ppf "`%s" name

jscomp/frontend/external_ffi_types.ml

@@ -309,12 +309,10 @@ let () =
     )
 let inline_string_primitive (s : string) (op : string option) : string list = 
   let lam : Lam_constant.t = 
-    match op with 
-    | Some op
-      when Ast_utf8_string_interp.is_unicode_string op ->
-      Const_unicode s
-    | _ ->
-      (Const_string { s; unicode = false }) in 
+    let unicode = match op with 
+      | Some op -> Ast_utf8_string_interp.is_unicode_string op
+      | None -> false in
+    (Const_string { s; unicode }) in 
   [""; to_string (Ffi_inline_const lam )]
 
 (* Let's only do it for string ATM

jscomp/frontend/external_ffi_types.pp.ml

@@ -311,12 +311,10 @@ let () =
     )
 let inline_string_primitive (s : string) (op : string option) : string list = 
   let lam : Lam_constant.t = 
-    match op with 
-    | Some op
-      when Ast_utf8_string_interp.is_unicode_string op ->
-      Const_unicode s
-    | _ ->
-      (Const_string { s; unicode = false }) in 
+    let unicode = match op with 
+      | Some op -> Ast_utf8_string_interp.is_unicode_string op
+      | None -> false in
+    (Const_string { s; unicode }) in 
   [""; to_string (Ffi_inline_const lam )]
 
 (* Let's only do it for string ATM