tweak

Author: bobzhang

jscomp/core/classify_function.ml

@@ -79,6 +79,10 @@ let classify_exp (prog : _ Flow_ast.Expression.t  )  : Js_raw_info.exp =
  | exception _ -> 
   Js_exp_unknown
 
+(** It seems we do the parse twice
+    - in parsing
+    - in code generation
+ *)
 let classify (prog : string) : Js_raw_info.exp = 
   let prog, errors  =
     Parser_flow.parse_expression 

jscomp/core/js_dump.ml

@@ -650,7 +650,7 @@ and expression_desc cxt ~(level:int) f x : cxt  =
      | Exp exp_info ->
        let raw_paren =
           not (match exp_info with  
-            | Js_literal _ | Js_raw_json -> true 
+            | Js_literal _  -> true 
             | Js_function _ | Js_exp_unknown -> false || raw_snippet_exp_simple_enough s) in 
        if raw_paren then P.string f L.lparen;
        P.string f s ;       

jscomp/core/js_raw_info.ml

@@ -40,7 +40,6 @@ type exp =
     | RegExp of RegExp.t
   ]}
   *)
-  | Js_raw_json
   | Js_exp_unknown
 
 

jscomp/core/lam_compile_const.ml

@@ -131,8 +131,8 @@ let translate_arg_cst (cst : External_arg_spec.cst) =
    | Arg_string_lit i -> 
      E.str i
    | Arg_js_null  -> E.nil
-   | Arg_js_json s 
-     -> E.raw_js_code (Exp Js_raw_json) s
+   | Arg_js_literal s 
+     -> E.raw_js_code (Exp (Js_literal {comment = None})) s
 
    | Arg_js_true  -> E.bool true
    | Arg_js_false -> E.bool false 

jscomp/syntax/ast_attributes.ml

@@ -265,8 +265,7 @@ let iter_process_bs_int_as  (attrs : t) =
 type as_const_payload = 
   | Int of int
   | Str of string
-  | Json_str of string  
-
+  | Js_literal_str of string
 let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
   let st = ref None in
   Ext_list.iter attrs
@@ -283,10 +282,9 @@ let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
                | Some (s,None) ->
                  st := Some (Str (s))
                | Some (s, Some "json") ->
-                 st := Some (Json_str s )
+                 st := Some (Js_literal_str s )
                | None | Some (_, Some _) ->
                  Bs_syntaxerr.err loc Expect_int_or_string_or_json_literal
-
              end
            | Some   v->
              st := (Some (Int v))

jscomp/syntax/ast_attributes.mli

@@ -82,8 +82,7 @@ val iter_process_bs_int_as :
 type as_const_payload = 
   | Int of int
   | Str of string
-  | Json_str of string  
-
+  | Js_literal_str of string
 
 val iter_process_bs_string_or_int_as :
     t ->

jscomp/syntax/ast_external_process.ml

@@ -112,8 +112,8 @@ let refine_arg_type ~(nolabel:bool) (ptyp : Ast_core_type.t)
        (* This type is used in bs.obj only to construct obj type*)
        Arg_cst(External_arg_spec.cst_int i)
      | Some (Str i)->
-       Arg_cst (External_arg_spec.cst_string i)
-     | Some (Json_str s) ->
+       Arg_cst (External_arg_spec.cst_string i)     
+     | Some (Js_literal_str s) ->
        (* FIXME: This seems to be wrong in bs.obj, we should disable such payload in bs.obj *)
        Arg_cst (External_arg_spec.cst_json ptyp.ptyp_loc s)
    else (* ([`a|`b] [@bs.string]) *)
@@ -138,7 +138,7 @@ let refine_obj_arg_type ~(nolabel:bool) (ptyp : Ast_core_type.t)
       Ast_literal.type_int ~loc:ptyp.ptyp_loc (), Arg_cst(External_arg_spec.cst_int i)
     | Some (Str i)->
       Ast_literal.type_string ~loc:ptyp.ptyp_loc (), Arg_cst (External_arg_spec.cst_string i)
-    | Some (Json_str _) ->
+    | Some (Js_literal_str _ ) ->
       Location.raise_errorf ~loc:ptyp.ptyp_loc "json payload is not supported in bs.obj since its type can not be inferred"
   else (* ([`a|`b] [@bs.string]) *)
     ptyp, spec_of_ptyp nolabel ptyp      

jscomp/syntax/external_arg_spec.ml

@@ -31,7 +31,7 @@ type cst =
   | Arg_js_null
   | Arg_js_true
   | Arg_js_false
-  | Arg_js_json of string
+  | Arg_js_literal of string
 
 type label_noname = 
   | Arg_label 
@@ -106,7 +106,7 @@ let cst_json (loc : Location.t) s : cst  =
   | True _ -> Arg_js_true
   | False _ -> Arg_js_false 
   | Null _ -> Arg_js_null 
-  | _ -> Arg_js_json s 
+  | _ -> Arg_js_literal s 
   | exception Ext_json_parse.Error (start,finish,error_info)
     ->
     let loc1 = {
@@ -117,7 +117,7 @@ let cst_json (loc : Location.t) s : cst  =
        Ext_position.offset loc.loc_start finish;
     } in 
      raise (Error (loc1 , error_info))
-
+let cst_obj_literal s = Arg_js_literal s
 let cst_int i = Arg_int_lit i 
 let cst_string s = Arg_string_lit s 
 let empty_label = Obj_empty 

jscomp/syntax/external_arg_spec.mli

@@ -28,7 +28,7 @@ type cst = private
   | Arg_js_null
   | Arg_js_true
   | Arg_js_false
-  | Arg_js_json of string
+  | Arg_js_literal of string
 
 
 type label = private
@@ -78,6 +78,7 @@ type param = {
 type obj_params = obj_param list 
 type params = param list 
 
+val cst_obj_literal : string -> cst 
 val cst_json : Location.t -> string -> cst 
 val cst_int : int -> cst 
 val cst_string : string -> cst