Adapt @as ppx to new string literals.

String literals are now represented as `{j*|xxx|j*}`.
Chang the `@as` ppx accordingly.

Author: cristianoc

jscomp/frontend/ast_attributes.ml

@@ -292,15 +292,16 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                                 pexp_desc =
                                   Pexp_constant
                                     (Pconst_string
-                                      (s, ((None | Some "json") as dec)));
+                                      (s, ((None | Some "json"| Some "*j") as dec)));
                                 pexp_loc;
                                 _;
                               },
                               _ );
                         _;
                       };
-                    ] ->
-                    if dec = None then st := Some (Str s)
+                    ]
+                     ->
+                    if dec = None || dec = Some "*j" then st := Some (Str s)
                     else (
                       (match
                          Classify_function.classify
@@ -313,7 +314,7 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                           Location.raise_errorf ~loc:pexp_loc
                             "an object literal expected");
                       st := Some (Js_literal_str s))
-                | _ -> Bs_syntaxerr.err loc Expect_int_or_string_or_json_literal
+                | _ -> 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

lib/4.06.1/unstable/js_compiler.ml

@@ -254524,15 +254524,16 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                                 pexp_desc =
                                   Pexp_constant
                                     (Pconst_string
-                                      (s, ((None | Some "json") as dec)));
+                                      (s, ((None | Some "json"| Some "*j") as dec)));
                                 pexp_loc;
                                 _;
                               },
                               _ );
                         _;
                       };
-                    ] ->
-                    if dec = None then st := Some (Str s)
+                    ]
+                     ->
+                    if dec = None || dec = Some "*j" then st := Some (Str s)
                     else (
                       (match
                          Classify_function.classify
@@ -254545,7 +254546,7 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                           Location.raise_errorf ~loc:pexp_loc
                             "an object literal expected");
                       st := Some (Js_literal_str s))
-                | _ -> Bs_syntaxerr.err loc Expect_int_or_string_or_json_literal
+                | _ -> 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

lib/4.06.1/whole_compiler.ml

@@ -258595,15 +258595,16 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                                 pexp_desc =
                                   Pexp_constant
                                     (Pconst_string
-                                      (s, ((None | Some "json") as dec)));
+                                      (s, ((None | Some "json"| Some "*j") as dec)));
                                 pexp_loc;
                                 _;
                               },
                               _ );
                         _;
                       };
-                    ] ->
-                    if dec = None then st := Some (Str s)
+                    ]
+                     ->
+                    if dec = None || dec = Some "*j" then st := Some (Str s)
                     else (
                       (match
                          Classify_function.classify
@@ -258616,7 +258617,7 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                           Location.raise_errorf ~loc:pexp_loc
                             "an object literal expected");
                       st := Some (Js_literal_str s))
-                | _ -> Bs_syntaxerr.err loc Expect_int_or_string_or_json_literal
+                | _ -> 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