Clean up utf8 transformation

Author: bobzhang

jscomp/core/lam_constant.ml

@@ -91,13 +91,13 @@ let rec convert_constant ( const : Lambda.structured_constant) : t =
     | Const_base (Const_int i) -> (Const_int i)
     | Const_base (Const_char i) -> (Const_char i)
     | Const_base (Const_string(i,opt)) ->
-      begin match opt with
+        (match opt with
         | Some opt when
-            Ext_string.equal opt Literals.escaped_j_delimiter ->
+            Ast_utf8_string_interp.is_unicode_string opt  ->
           Const_unicode i
         | _ ->
-          Const_string i
-      end
+          Const_string i)
+      
     | Const_base (Const_float i) -> (Const_float i)
     | Const_base (Const_int32 i) -> (Const_int32 i)
     | Const_base (Const_int64 i) -> (Const_int64 i)

jscomp/ext/literals.ml

@@ -119,7 +119,6 @@ let reactjs_jsx_ppx_2_exe = "reactjs_jsx_ppx_2.exe"
 let reactjs_jsx_ppx_3_exe  = "reactjs_jsx_ppx_3.exe"
 let unescaped_j_delimiter = "j"
 let unescaped_js_delimiter = "js"
-let escaped_j_delimiter =  "*j" (* not user level syntax allowed *)
 
 let native = "native"
 let bytecode = "bytecode"

jscomp/ext/literals.mli

@@ -119,7 +119,7 @@ val dash_nostdlib : string
 val reactjs_jsx_ppx_2_exe : string 
 val reactjs_jsx_ppx_3_exe : string 
 val unescaped_j_delimiter : string 
-val escaped_j_delimiter : string 
+
 
 val unescaped_js_delimiter : string 
 

jscomp/syntax/ast_attributes.ml

@@ -249,16 +249,15 @@ let iter_process_bs_string_as  (attrs : t) : string option =
   !st
 
 let has_bs_optional  (attrs : t) : bool =
-  List.exists
-    (fun
-      (({txt ; loc}, _payload ) as attr : attr)  ->
+  Ext_list.exists attrs (fun
+      (({txt ; }, _ ) as attr)  ->
       match  txt with
       | "bs.optional"
         ->
         Bs_ast_invariant.mark_used_bs_attribute attr ;
         true
       | _  -> false
-    ) attrs
+    ) 
 
 
 

jscomp/syntax/ast_utf8_string_interp.ml

@@ -384,8 +384,9 @@ let to_string_ident : Longident.t =
     Ldot (Ldot (Lident "Js", "String"), "make")
 
 
+let escaped_j_delimiter =  "*j" (* not user level syntax allowed *)
 
-let escaped = Some Literals.escaped_j_delimiter 
+let escaped = Some escaped_j_delimiter 
 
 let concat_exp 
   (a : Parsetree.expression)
@@ -440,8 +441,7 @@ let transform_interp loc s =
     let rev_segments =  cxt.segments in 
     match rev_segments with 
     | [] -> 
-      Ast_compatible.const_exp_string ~loc 
-        ""  ~delimiter:Literals.escaped_j_delimiter
+      Ast_compatible.const_exp_string ~loc ""  ?delimiter:escaped
     | [ segment] -> 
       aux loc segment 
     | a::rest -> 
@@ -454,3 +454,21 @@ let transform_interp loc s =
     -> 
     Location.raise_errorf ~loc:(update border start pos loc )
       "%a"  pp_error error 
+
+
+let transform (e : Parsetree.expression) s delim : Parsetree.expression = 
+    if Ext_string.equal delim Literals.unescaped_js_delimiter then
+        let js_str = Ast_utf8_string.transform e.pexp_loc s in
+        { e with pexp_desc =
+                       Pexp_constant (
+#if OCAML_VERSION =~ ">4.03.0" then
+            Pconst_string
+#else            
+            Const_string 
+#end                                     
+                         (js_str, escaped))}
+    else if Ext_string.equal delim Literals.unescaped_j_delimiter then
+            transform_interp e.pexp_loc s
+    else e
+
+let is_unicode_string opt = Ext_string.equal opt escaped_j_delimiter    

jscomp/syntax/ast_utf8_string_interp.mli

@@ -65,4 +65,15 @@ type exn += Error of pos *  pos * error
 val empty_segment : segment -> bool
 
 val transform_test : string -> segment list
-val transform_interp : Location.t -> string -> Parsetree.expression
+
+
+
+val transform : 
+  Parsetree.expression -> 
+  string -> 
+  string -> 
+  Parsetree.expression
+
+val is_unicode_string :   
+  string -> 
+  bool

jscomp/syntax/ppx_entry.ml

@@ -70,9 +70,10 @@ let reset () =
   record_as_js_object := false ;
   no_export  :=  false
 
+
 let rec unsafe_mapper : Bs_ast_mapper.mapper =
   { Bs_ast_mapper.default_mapper with
-    expr = (fun self ({ pexp_loc = loc } as e) ->
+    expr = (fun self e ->
         match e.pexp_desc with
         (** Its output should not be rewritten anymore *)
         | Pexp_extension extension ->
@@ -85,19 +86,7 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
 #end            
             (s, (Some delim)))
           ->
-          if Ext_string.equal delim Literals.unescaped_js_delimiter then
-            let js_str = Ast_utf8_string.transform loc s in
-            { e with pexp_desc =
-                       Pexp_constant (
-#if OCAML_VERSION =~ ">4.03.0" then
-            Pconst_string
-#else            
-            Const_string 
-#end                                     
-                         (js_str, Some Literals.escaped_j_delimiter))}
-          else if Ext_string.equal delim Literals.unescaped_j_delimiter then
-            Ast_utf8_string_interp.transform_interp loc s
-          else e
+            Ast_utf8_string_interp.transform e s delim
         (** End rewriting *)
         | Pexp_function cases ->
           (* {[ function [@bs.exn]
@@ -110,7 +99,7 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
             | `Nothing, _ ->
               Bs_ast_mapper.default_mapper.expr self  e
             | `Exn, pexp_attributes ->
-              Ast_util.convertBsErrorFunction loc self  pexp_attributes cases
+              Ast_util.convertBsErrorFunction e.pexp_loc self  pexp_attributes cases
           end
         | Pexp_fun (arg_label, _, pat , body)
           when Ast_compatible.is_arg_label_simple arg_label
@@ -121,13 +110,13 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
             | Uncurry _, pexp_attributes
               ->
               {e with
-               pexp_desc = Ast_util.to_uncurry_fn loc self pat body  ;
+               pexp_desc = Ast_util.to_uncurry_fn e.pexp_loc self pat body  ;
                pexp_attributes}
             | Method _ , _
-              ->  Location.raise_errorf ~loc "bs.meth is not supported in function expression"
+              ->  Location.raise_errorf ~loc:e.pexp_loc "bs.meth is not supported in function expression"
             | Meth_callback _, pexp_attributes
               ->
-              {e with pexp_desc = Ast_util.to_method_callback loc  self pat body ;
+              {e with pexp_desc = Ast_util.to_method_callback e.pexp_loc  self pat body ;
                       pexp_attributes }
           end
         | Pexp_apply (fn, args  ) ->
@@ -138,7 +127,7 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
              | None ->
                { e with
                  pexp_desc =
-                   Ast_util.record_as_js_object loc self label_exprs;
+                   Ast_util.record_as_js_object e.pexp_loc self label_exprs;
                }
              | Some e ->
                Location.raise_errorf
@@ -159,7 +148,7 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
               {e with
                pexp_desc =
                  Ast_util.ocaml_obj_as_js_object
-                   loc self pcstr_self pcstr_fields;
+                   e.pexp_loc self pcstr_self pcstr_fields;
                pexp_attributes
               }
             | `Nothing , _ ->
@@ -313,8 +302,8 @@ let rewrite_implementation : (Parsetree.structure -> Parsetree.structure) ref =
         | {pstr_desc = Pstr_attribute ({txt = "bs.config"; loc}, payload); _} :: rest
           ->
           begin
-            Ast_payload.ident_or_record_as_config loc payload
-            |> List.iter (Ast_payload.table_dispatch structural_config_table) ;
+            Ext_list.iter (Ast_payload.ident_or_record_as_config loc payload)
+              (Ast_payload.table_dispatch structural_config_table) ;
             let rest = unsafe_mapper.structure unsafe_mapper rest in
             if !no_export then
               [Str.include_ ~loc