Add delim to the representation of strings.

Author: cristianoc

jscomp/core/j.ml

@@ -147,7 +147,7 @@ and expression_desc =
  it will be true when it's a method
  The last pararemter [true] return unit
  *)
- | Str of {pure: bool; txt: string}
+ | Str of {delim: string option; txt: string}
  (* A string is UTF-8 encoded, and may contain
  escape sequences.
  *)

jscomp/core/js_analyzer.ml

@@ -90,7 +90,7 @@ let rec no_side_effect_expression_desc (x : J.expression_desc) =
  | String_index (a, b) | Array_index (a, b) ->
  no_side_effect a && no_side_effect b
  | Is_null_or_undefined b -> no_side_effect b
- | Str {pure} -> pure
+ | Str _ -> true
  | Array (xs, _mutable_flag) | Caml_block (xs, _mutable_flag, _, _) ->
  (* create [immutable] block,
  does not really mean that this opreation itself is [pure].
@@ -181,8 +181,8 @@ let rec eq_expression ({ expression_desc = x0 } : J.expression)
  | Bin (op1, a1, b1) ->
  op0 = op1 && eq_expression a0 a1 && eq_expression b0 b1
  | _ -> false)
- | Str {pure=a0; txt=b0} -> (
- match y0 with Str {pure=a1; txt=b1} -> a0 = a1 && b0 = b1 | _ -> false)
+ | Str {delim=a0; txt=b0} -> (
+ match y0 with Str {delim=a1; txt=b1} -> a0 = a1 && b0 = b1 | _ -> false)
  | Static_index (e0, p0, off0) -> (
  match y0 with
  | Static_index (e1, p1, off1) ->

jscomp/core/js_dump.ml

@@ -591,11 +591,12 @@ and expression_desc cxt ~(level : int) f x : cxt =
  P.string f s;
  P.string f "\"";
  cxt
- | Str {txt} ->
+ | Str {delim; txt} ->
  (*TODO --
  when utf8-> it will not escape '\\' which is definitely not we want
  *)
- Js_dump_string.pp_string f txt;
+ if delim <> None then P.string f ("\"" ^ txt ^ "\"")
+ else Js_dump_string.pp_string f txt;
  cxt
  | Raw_js_code { code = s; code_info = info } -> (
  match info with

jscomp/core/js_exp_make.ml

@@ -125,8 +125,8 @@ 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 ?(pure = true) ?comment s : t =
- { expression_desc = Str {pure; txt=s}; comment }
+let str ?(delim = None) ?comment txt : t =
+ { expression_desc = Str {txt; delim}; comment }
 
 let unicode ?comment s : t = { expression_desc = Unicode s; comment }
 

jscomp/core/js_exp_make.mli

@@ -82,7 +82,7 @@ val pure_runtime_call :
 
 val runtime_ref : string -> string -> t
 
-val str : ?pure:bool -> ?comment:string -> string -> t
+val str : ?delim: string option -> ?comment: string -> string -> t
 
 val unicode : ?comment:string -> string -> t
 

jscomp/core/js_fold.ml

@@ -288,3 +288,4 @@ class fold =
  let _self = _self#required_modules _x1 in
  _self
  end
+ 

jscomp/core/js_record_fold.ml

@@ -305,3 +305,4 @@ let super : 'state iter =
  block;
  program;
  }
+ 

jscomp/core/js_record_iter.ml

@@ -226,3 +226,4 @@ let super : iter =
  block;
  program;
  }
+ 

jscomp/core/js_record_map.ml

@@ -302,3 +302,4 @@ let super : iter =
  block;
  program;
  }
+ 

lib/4.06.1/unstable/js_compiler.ml

@@ -65323,7 +65323,7 @@ and expression_desc =
  it will be true when it's a method
  The last pararemter [true] return unit
  *)
- | Str of {pure: bool; txt: string}
+ | Str of {delim: string option; txt: string}
  (* A string is UTF-8 encoded, and may contain
  escape sequences.
  *)
@@ -66384,7 +66384,7 @@ let super : iter =
  block;
  program;
  }
-
+ 
 end
 module Js_analyzer : sig 
 #1 "js_analyzer.mli"
@@ -66556,7 +66556,7 @@ let rec no_side_effect_expression_desc (x : J.expression_desc) =
  | String_index (a, b) | Array_index (a, b) ->
  no_side_effect a && no_side_effect b
  | Is_null_or_undefined b -> no_side_effect b
- | Str {pure} -> pure
+ | Str _ -> true
  | Array (xs, _mutable_flag) | Caml_block (xs, _mutable_flag, _, _) ->
  (* create [immutable] block,
  does not really mean that this opreation itself is [pure].
@@ -66647,8 +66647,8 @@ let rec eq_expression ({ expression_desc = x0 } : J.expression)
  | Bin (op1, a1, b1) ->
  op0 = op1 && eq_expression a0 a1 && eq_expression b0 b1
  | _ -> false)
- | Str {pure=a0; txt=b0} -> (
- match y0 with Str {pure=a1; txt=b1} -> a0 = a1 && b0 = b1 | _ -> false)
+ | Str {delim=a0; txt=b0} -> (
+ match y0 with Str {delim=a1; txt=b1} -> a0 = a1 && b0 = b1 | _ -> false)
  | Static_index (e0, p0, off0) -> (
  match y0 with
  | Static_index (e1, p1, off1) ->
@@ -66982,7 +66982,7 @@ val pure_runtime_call :
 
 val runtime_ref : string -> string -> t
 
-val str : ?pure:bool -> ?comment:string -> string -> t
+val str : ?delim: string option -> ?comment: string -> string -> t
 
 val unicode : ?comment:string -> string -> t
 
@@ -67370,8 +67370,8 @@ 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 ?(pure = true) ?comment s : t =
- { expression_desc = Str {pure; txt=s}; comment }
+let str ?(delim = None) ?comment txt : t =
+ { expression_desc = Str {txt; delim}; comment }
 
 let unicode ?comment s : t = { expression_desc = Unicode s; comment }
 
@@ -69756,11 +69756,12 @@ and expression_desc cxt ~(level : int) f x : cxt =
  P.string f s;
  P.string f "\"";
  cxt
- | Str {txt} ->
+ | Str {delim; txt} ->
  (*TODO --
  when utf8-> it will not escape '\\' which is definitely not we want
  *)
- Js_dump_string.pp_string f txt;
+ if delim <> None then P.string f ("\"" ^ txt ^ "\"")
+ else Js_dump_string.pp_string f txt;
  cxt
  | Raw_js_code { code = s; code_info = info } -> (
  match info with
@@ -79577,7 +79578,7 @@ let super : iter =
  block;
  program;
  }
-
+ 
 end
 module Js_pass_flatten : sig 
 #1 "js_pass_flatten.mli"
@@ -80361,7 +80362,7 @@ let super : 'state iter =
  block;
  program;
  }
-
+ 
 end
 module Js_pass_scope : sig 
 #1 "js_pass_scope.mli"