Merge branch 'master' of https://github.com/rescript-lang/rescript-compiler

Author: cristianoc

jscomp/core/j.ml

@@ -151,8 +151,6 @@ and expression_desc =
   (* A string is UTF-8 encoded, and may contain
      escape sequences.
   *)
-  | Unicode of string
-  (* It is escaped string, print delimited by '"'*)
   | Raw_js_code of Js_raw_info.t
   (* literally raw JS code 
   *)

jscomp/core/js_analyzer.ml

@@ -82,7 +82,7 @@ let free_variables_of_expression st =
 
 let rec no_side_effect_expression_desc (x : J.expression_desc) =
   match x with
-  | Undefined | Null | Bool _ | Var _ | Unicode _ -> true
+  | Undefined | Null | Bool _ | Var _ -> true
   | Fun _ -> true
   | Number _ -> true (* Can be refined later *)
   | Static_index (obj, (_name : string), (_pos : int32 option)) ->
@@ -183,8 +183,6 @@ let rec eq_expression ({ expression_desc = x0 } : J.expression)
       | _ -> false)
   | Str {delim=a0; txt=b0} -> (
       match y0 with Str {delim=a1; txt=b1} -> a0 = a1 && b0 = b1 | _ -> false)
-  | Unicode s0 -> (
-      match y0 with Unicode s1 -> s0 = s1 | _ -> false)
   | Static_index (e0, p0, off0) -> (
       match y0 with
       | Static_index (e1, p1, off1) ->
@@ -270,6 +268,6 @@ let rev_toplevel_flatten block =
 
 let rec is_okay_to_duplicate (e : J.expression) =
   match e.expression_desc with
-  | Var _ | Bool _ | Str _ | Unicode _ | Number _ -> true
+  | Var _ | Bool _ | Str _ | Number _ -> true
   | Static_index (e, _s, _off) -> is_okay_to_duplicate e
   | _ -> false

jscomp/core/js_dump.ml

@@ -162,7 +162,7 @@ let exp_need_paren (e : J.expression) =
   | Raw_js_code { code_info = Stmt _ }
   | Length _ | Call _ | Caml_block_tag _ | Seq _ | Static_index _ | Cond _
   | Bin _ | Is_null_or_undefined _ | String_index _ | Array_index _
-  | String_append _ | Var _ | Undefined | Null | Str _ | Unicode _ | Array _
+  | String_append _ | Var _ | Undefined | Null | Str _ | Array _
   | Optional_block _ | Caml_block _ | FlatCall _ | Typeof _ | Number _
   | Js_not _ | Bool _ | New _ ->
       false
@@ -586,11 +586,6 @@ and expression_desc cxt ~(level : int) f x : cxt =
           P.string f L.codePointAt;
           (* FIXME: use code_point_at *)
           P.paren_group f 1 (fun _ -> expression ~level:0 cxt f b))
-  | Unicode s ->
-      P.string f "\"";
-      P.string f s;
-      P.string f "\"";
-      cxt
   | Str {delim; txt} ->
       (*TODO --
          when utf8-> it will not escape '\\' which is definitely not we want

jscomp/core/js_exp_make.ml

@@ -35,7 +35,7 @@ type t = J.expression
  *)
 let rec remove_pure_sub_exp (x : t) : t option =
   match x.expression_desc with
-  | Var _ | Str _ | Unicode _ | Number _ -> None (* Can be refined later *)
+  | Var _ | Str _ | Number _ -> None (* Can be refined later *)
   | Array_index (a, b) ->
       if is_pure_sub_exp a && is_pure_sub_exp b then None else Some x
   | Array (xs, _mutable_flag) ->
@@ -128,8 +128,6 @@ let runtime_ref module_name fn_name = runtime_var_dot module_name fn_name
 let str ?(delim = None) ?comment txt : t =
   { expression_desc = Str {txt; delim}; comment }
 
-let unicode ?comment s : t = { expression_desc = Unicode s; comment }
-
 let raw_js_code ?comment info s : t =
   {
     expression_desc = Raw_js_code { code = String.trim s; code_info = info };
@@ -173,7 +171,7 @@ module L = Literals
 let typeof ?comment (e : t) : t =
   match e.expression_desc with
   | Number _ | Length _ -> str ?comment L.js_type_number
-  | Str _ | Unicode _ -> str ?comment L.js_type_string
+  | Str _ -> str ?comment L.js_type_string
   | Array _ -> str ?comment L.js_type_object
   | Bool _ -> str ?comment L.js_type_boolean
   | _ -> { expression_desc = Typeof e; comment }
@@ -477,7 +475,7 @@ let array_length ?comment (e : t) : t =
 
 let string_length ?comment (e : t) : t =
   match e.expression_desc with
-  | Str {txt} -> int ?comment (Int32.of_int (String.length txt))
+  | Str {txt; delim=None} -> int ?comment (Int32.of_int (String.length txt))
   (* No optimization for {j||j}*)
   | _ -> { expression_desc = Length (e, String); comment }
 
@@ -551,8 +549,6 @@ let rec triple_equal ?comment (e0 : t) (e1 : t) : t =
   | Str {txt=x}, Str {txt=y} ->
       (* CF*)
       bool (Ext_string.equal x y)
-  | Unicode x, Unicode y ->
-      bool (Ext_string.equal x y)
   | Number (Int { i = i0; _ }), Number (Int { i = i1; _ }) -> bool (i0 = i1)
   | Optional_block (a, _), Optional_block (b, _) -> triple_equal ?comment a b
   | Undefined, Optional_block _
@@ -609,7 +605,7 @@ let and_ ?comment (e1 : t) (e2 : t) : t =
       Bin
         ( EqEqEq,
           { expression_desc = Var j },
-          { expression_desc = Str _ | Number _ | Unicode _ } ) )
+          { expression_desc = Str _ | Number _ } ) )
     when Js_op_util.same_vident i j ->
       e2
   | _, _ -> { expression_desc = Bin (And, e1, e2); comment }
@@ -729,7 +725,6 @@ let int_equal = float_equal
 let string_equal ?comment (e0 : t) (e1 : t) : t =
   match (e0.expression_desc, e1.expression_desc) with
   | Str {txt=a0}, Str {txt=b0} -> bool (Ext_string.equal a0 b0)
-  | Unicode a0, Unicode b0 -> bool (Ext_string.equal a0 b0)
   | _, _ -> { expression_desc = Bin (EqEqEq, e0, e1); comment }
 
 let is_type_number ?comment (e : t) : t =
@@ -812,8 +807,7 @@ let uint32 ?comment n : J.expression =
 
 let string_comp (cmp : J.binop) ?comment (e0 : t) (e1 : t) =
   match (e0.expression_desc, e1.expression_desc) with
-  | Str {txt=a0}, Str {txt=b0}
-  | Unicode a0, Unicode b0 -> (
+  | Str {txt=a0}, Str {txt=b0} -> (
       match cmp with
       | EqEqEq -> bool (a0 = b0)
       | NotEqEq -> bool (a0 <> b0)

jscomp/core/js_exp_make.mli

@@ -84,8 +84,6 @@ val runtime_ref : string -> string -> t
 
 val str : ?delim: string option -> ?comment: string -> string -> t
 
-val unicode : ?comment:string -> string -> t
-
 val ocaml_fun :
   ?comment:string ->
   ?immutable_mask:bool array ->

jscomp/core/js_fold.ml

@@ -151,7 +151,6 @@ class fold =
           let _self = _self#block _x2 in
           _self
       | Str _ -> _self
-      | Unicode _ -> _self
       | Raw_js_code _ -> _self
       | Array (_x0, _x1) ->
           let _self = list (fun _self -> _self#expression) _self _x0 in

jscomp/core/js_pass_flatten_and_mark_dead.ml

@@ -192,7 +192,7 @@ let subst_map (substitution : J.expression Hash_ident.t) =
             let _, e, bindings =
               Ext_list.fold_left ls (0, [], []) (fun (i, e, acc) x ->
                   match x.expression_desc with
-                  | Var _ | Number _ | Str _ | Unicode _ | J.Bool _ | Undefined ->
+                  | Var _ | Number _ | Str _ | J.Bool _ | Undefined ->
                       (* TODO: check the optimization *)
                       (i + 1, x :: e, acc)
                   | _ ->

jscomp/core/js_pass_scope.ml

@@ -220,7 +220,7 @@ let record_scope_pass =
                       TODO:
                   *)
                         match x.expression_desc with
-                        | Fun _ | Number _ | Str _ | Unicode _ -> state
+                        | Fun _ | Number _ | Str _ -> state
                         | _ ->
                             (* if Set_ident.(is_empty @@ *)
                             (*   inter self#get_mutable_values  *)

jscomp/core/js_record_fold.ml

@@ -157,7 +157,6 @@ let expression_desc : 'a. ('a, expression_desc) fn =
       let st = _self.block _self st _x2 in
       st
   | Str _ -> st
-  | Unicode _ -> st
   | Raw_js_code _ -> st
   | Array (_x0, _x1) ->
       let st = list _self.expression _self st _x0 in

jscomp/core/js_record_iter.ml

@@ -122,7 +122,6 @@ let expression_desc : expression_desc fn =
       list _self.ident _self _x1;
       _self.block _self _x2
   | Str _ -> ()
-  | Unicode _ -> ()
   | Raw_js_code _ -> ()
   | Array (_x0, _x1) -> list _self.expression _self _x0
   | Optional_block (_x0, _x1) -> _self.expression _self _x0

jscomp/core/js_record_map.ml

@@ -155,7 +155,6 @@ let expression_desc : expression_desc fn =
       let _x2 = _self.block _self _x2 in
       Fun (_x0, _x1, _x2, _x3, _x4)
   | Str _ as v -> v
-  | Unicode _ as v -> v
   | Raw_js_code _ as v -> v
   | Array (_x0, _x1) ->
       let _x0 = list _self.expression _self _x0 in

jscomp/core/js_stmt_make.ml

@@ -131,8 +131,7 @@ let string_switch ?(comment : string option)
     ?(declaration : (J.property * Ident.t) option) ?(default : J.block option)
     (e : J.expression) (clauses : (string * J.case_clause) list) : t =
   match e.expression_desc with
-  | Str {txt}
-  | Unicode txt -> (
+  | Str {txt} -> (
       let continuation =
         match
           Ext_list.find_opt clauses (fun (switch_case, x) ->

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 i (*TODO: here inline js*) -> E.str i
-  | Const_unicode i -> E.unicode i
+  | 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)