Merge pull request #2726 from BuckleScript/relax_bs_raw

generalize bs.raw

Author: bobzhang

jscomp/all.depend

@@ -254,9 +254,10 @@ syntax/ast_exp_apply.cmx : ext/literals.cmx ext/ext_list.cmx \
     syntax/ast_tuple_pattern_flatten.cmx syntax/ast_literal.cmx \
     syntax/ast_attributes.cmx syntax/ast_exp_apply.cmi
 syntax/ast_exp_extension.cmx : ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_ref.cmx syntax/bs_ast_mapper.cmx syntax/ast_util.cmx \
-    syntax/ast_payload.cmx syntax/ast_literal.cmx syntax/ast_derive.cmx \
-    syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_exp_extension.cmi
+    ext/ext_ref.cmx ext/ext_pervasives.cmx common/bs_version.cmx \
+    syntax/bs_ast_mapper.cmx syntax/ast_util.cmx syntax/ast_payload.cmx \
+    syntax/ast_literal.cmx syntax/ast_derive.cmx syntax/ast_core_type.cmx \
+    syntax/ast_comb.cmx syntax/ast_exp_extension.cmi
 syntax/ast_core_type_class_type.cmx : ext/literals.cmx ext/ext_ref.cmx \
     ext/ext_list.cmx syntax/bs_ast_mapper.cmx syntax/ast_util.cmx \
     syntax/ast_literal.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
@@ -455,7 +456,7 @@ core/lam.cmx : ext/ordered_hash_map_local_ident.cmx ext/literals.cmx \
     ext/ident_hashtbl.cmx ext/ident_hash_set.cmx ext/hash_set_ident_mask.cmx \
     syntax/external_ffi_types.cmx syntax/external_arg_spec.cmx \
     ext/ext_string.cmx ext/ext_scc.cmx common/ext_log.cmx ext/ext_list.cmx \
-    core/lam.cmi
+    syntax/ast_exp_extension.cmx core/lam.cmi
 core/lam_print.cmx : core/lam.cmx ext/ext_list.cmx core/lam_print.cmi
 core/lam_beta_reduce_util.cmx : core/lam.cmx ext/ident_hashtbl.cmx \
     core/lam_beta_reduce_util.cmi

jscomp/bin/all_ounit_tests.ml

@@ -3556,6 +3556,7 @@ val setter_suffix_len : int
 val debugger : string
 val raw_expr : string
 val raw_stmt : string
+val raw_function : string
 val unsafe_downgrade : string
 val fn_run : string
 val method_run : string
@@ -3690,6 +3691,7 @@ let setter_suffix_len = String.length setter_suffix
 let debugger = "debugger"
 let raw_expr = "raw_expr"
 let raw_stmt = "raw_stmt"
+let raw_function = "raw_function"
 let unsafe_downgrade = "unsafe_downgrade"
 let fn_run = "fn_run"
 let method_run = "method_run"

jscomp/core/bs_conditional_initial.ml

@@ -25,7 +25,7 @@
 
 let setup_env () =
 #if BS_DEBUG then
-    Js_config.set_debug_file "gpr_2700_test.ml";
+    Js_config.set_debug_file "gpr_2682_test.ml";
 #end
   Lexer.replace_directive_bool "BS" true;
   Lexer.replace_directive_string "BS_VERSION"  Bs_version.version

jscomp/core/j.ml

@@ -61,6 +61,8 @@ and tag_info = Js_op.tag_info
 and required_modules = Js_op.required_modules
 
 and code_info = Js_op.code_info 
+
+
 (** object literal, if key is ident, in this case, it might be renamed by 
     Google Closure  optimizer,
     currently we always use quote
@@ -166,6 +168,7 @@ and expression_desc =
   | Unicode of string 
     (* It is escaped string, print delimited by '"'*)   
   | Raw_js_code of string * code_info
+  | Raw_js_function of string * string list
   (* literally raw JS code 
   *)
   | Array of expression list * mutable_flag

jscomp/core/js_analyzer.ml

@@ -83,6 +83,7 @@ let free_variables_of_expression used_idents defined_idents st =
 
 let rec no_side_effect_expression_desc (x : J.expression_desc)  = 
   match x with 
+  | Raw_js_function _
   | Undefined
   | Null
   | Bool _ 
@@ -264,6 +265,7 @@ let rec eq_expression
     | Fun _ 
     | Unicode _ 
     | Raw_js_code _
+    | Raw_js_function _
     | Array _ 
     | Caml_block _ 
     (* | Caml_uninitialized_obj _  *)

jscomp/core/js_dump.ml

@@ -65,6 +65,15 @@ let op_prec, op_str  =
   Js_op_util.(op_prec, op_str)
 
 
+let rec comma_strings  f (ls : string list)  =
+  match ls with
+  | [] -> ()
+  | [x] -> P.string  f x
+  | y :: ys ->
+    P.string f y;
+    P.string f L.comma;
+    comma_strings  f ys
+
 let rec comma_idents  cxt f (ls : Ident.t list)  =
   match ls with
   | [] -> cxt
@@ -539,7 +548,15 @@ and
     *)
     Js_dump_string.pp_string f  s;
     cxt
-
+  | Raw_js_function (s,params) ->   
+    P.string f L.function_; 
+    P.space f ; 
+    P.paren_group f 1 (fun _ ->
+        comma_strings f params
+      );
+    P.brace f (fun _ -> 
+        P.string f s);
+    cxt 
   | Raw_js_code (s,info) ->
     begin match info with
       | Exp ->
@@ -1025,7 +1042,9 @@ and statement_desc top cxt f (s : J.statement_desc) : Ext_pp_scope.t =
       | Call ({expression_desc = Fun _; },_,_) -> true
       (* | Caml_uninitialized_obj _  *)
       | Raw_js_code (_, Exp)
-      | Fun _ | Object _ -> true
+      | Fun _ 
+      | Raw_js_function _ 
+      | Object _ -> true
       | Raw_js_code (_,Stmt)
       | Caml_block_set_tag _
       | Length _

jscomp/core/js_exp_make.ml

@@ -141,6 +141,9 @@ let unicode ?comment s : t =
 let raw_js_code ?comment info s : t =
   {expression_desc = Raw_js_code (s,info) ; comment }
 
+let raw_js_function ?comment arg block : t = 
+  {expression_desc = Raw_js_function(arg,block); comment}
+  
 let array ?comment mt es : t  = 
   {expression_desc = Array (es,mt) ; comment}
 

jscomp/core/js_exp_make.mli

@@ -317,7 +317,7 @@ val dummy_obj : ?comment:string ->  unit -> t
 val of_block : ?comment:string -> ?e:J.expression -> J.statement list -> t
 
 val raw_js_code : ?comment:string -> J.code_info ->  string -> t
-
+val raw_js_function : ?comment:string -> string -> string list -> t
 val nil : t 
 val is_null : unary_op
 

jscomp/core/js_fold.ml

@@ -358,6 +358,9 @@ class virtual fold =
       | Unicode _x -> let o = o#string _x in o
       | Raw_js_code (_x, _x_i1) ->
           let o = o#string _x in let o = o#code_info _x_i1 in o
+      | Raw_js_function (_x, _x_i1) ->
+          let o = o#string _x in
+          let o = o#list (fun o -> o#string) _x_i1 in o
       | Array (_x, _x_i1) ->
           let o = o#list (fun o -> o#expression) _x in
           let o = o#mutable_flag _x_i1 in o

jscomp/core/js_map.ml

@@ -396,6 +396,10 @@ class virtual map =
       | Raw_js_code (_x, _x_i1) ->
           let _x = o#string _x in
           let _x_i1 = o#code_info _x_i1 in Raw_js_code (_x, _x_i1)
+      | Raw_js_function (_x, _x_i1) ->
+          let _x = o#string _x in
+          let _x_i1 = o#list (fun o -> o#string) _x_i1
+          in Raw_js_function (_x, _x_i1)
       | Array (_x, _x_i1) ->
           let _x = o#list (fun o -> o#expression) _x in
           let _x_i1 = o#mutable_flag _x_i1 in Array (_x, _x_i1)