adapt runtime, fun%raw is not needed any more

Author: bobzhang

jscomp/others/js_dict.ml

@@ -54,10 +54,11 @@ external empty : unit -> 'a t = "" [@@bs.obj]
 
 
 let unsafeDeleteKey : string t -> string -> unit [@bs] =
-  fun%raw dict key -> {|
+  [%raw {| function (dict,key){
      delete dict[key];
      return 0
-  |}
+     }
+  |}]
 
 
 external unsafeCreate : int -> 'a array = "Array" [@@bs.new]

jscomp/runtime/caml_chrome_debugger.ml

@@ -22,9 +22,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
- type obj = Caml_obj_extern.t
-
- let setupChromeDebugger : unit -> unit = fun%raw unit -> {|
+type obj = Caml_obj_extern.t
+open Js_internalRaw
+ let setupChromeDebugger : unit -> unit = [%raw{|function(_){
 
  // I don't know how to directly refer to the classes that chrome's built-in
  // formatters use. adding "class": "foo" doesn't seem to work
@@ -141,8 +141,8 @@ if (typeof window === "undefined"){
  window.devtoolsFormatters = [formatter]
 }
 return 0
-
-|}
+}
+|}]
 
 
 let setup = ref false 
@@ -155,10 +155,12 @@ let setupOnce () =
 
 type symbol
 
+type 'a t = { value : 'a} 
 
 external cacheSymbol : string -> symbol = "for"
  [@@bs.scope "Symbol"] [@@bs.val]
-external addProp : 'a -> symbol -> <value: 'b> Js.t -> 'a = 
+
+external addProp : 'a -> symbol -> 'b t  -> 'a = 
   "defineProperty"  [@@bs.scope "Object"] [@@bs.val]
 
 let __ = Block.__
@@ -167,13 +169,13 @@ let __ = Block.__
 let variant meta tag xs =     
   setupOnce ();
   xs |. Caml_obj_extern.set_tag tag;
-  xs |. addProp (cacheSymbol "BsVariant") [%obj {value = meta }] 
+  xs |. addProp (cacheSymbol "BsVariant") {value = meta }
 
 let simpleVariant meta xs =       
   setupOnce ();
-  xs |. addProp (cacheSymbol "BsVariant") [%obj {value = meta }] 
+  xs |. addProp (cacheSymbol "BsVariant") {value = meta }
 
 
 let polyVar meta xs =   
   setupOnce ();
-  xs |. addProp (cacheSymbol "BsPolyVar") [%obj {value = meta}]
+  xs |. addProp (cacheSymbol "BsPolyVar") {value = meta}

jscomp/runtime/caml_external_polyfill.ml

@@ -21,30 +21,30 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-
-let  getGlobalThis= fun%raw () -> {|
+open Js_internalRaw
+let  getGlobalThis= [%raw{| function(){
   if (typeof globalThis !== 'undefined') return globalThis;
 	if (typeof self !== 'undefined') return self;
 	if (typeof window !== 'undefined') return window;
 	if (typeof global !== 'undefined') return global;
 	if (typeof this !== 'undefined') return this;
 	throw new Error('Unable to locate global `this`');
-|}
+}|}]
 
-let resolve  = fun%raw s -> {|
+let resolve  = [%raw {|function(s){
   var myGlobal = getGlobalThis();
   if (myGlobal[s] === undefined){
     throw new Error(s + " not polyfilled by BuckleScript yet\n")
   }
   return myGlobal[s]
-|}
+}|}]
 
 (* FIXME: it does not have to global states *)
 type fn 
 
 
-let register : string -> fn -> unit = fun%raw s fn -> {|
+let register : string -> fn -> unit = [%raw{| function(s,fn){
   var myGlobal = getGlobalThis();
   myGlobal[s] = fn 
   return 0
-|}
+}|}]

jscomp/runtime/caml_float.ml

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
+open Js_internalRaw
 (** *)
 
 (* borrowed from others/js_math.ml *)
@@ -37,16 +37,16 @@ external pow_float : base:float -> exp:float -> float = "Math.pow" [@@bs.val]
 external int_of_float : float -> int = "%intoffloat"
 external float_of_int : int -> float = "%floatofint"
 
-let caml_int32_float_of_bits : int32 -> float = fun%raw x -> {|
+let caml_int32_float_of_bits : int32 -> float = [%raw{|function(x){
     return new Float32Array(new Int32Array([x]).buffer)[0] 
-|}
+    }|}]
   (* let int32 = Int32_array.make [| x |] in
   let float32 = Float32_array.fromBuffer ( Int32_array.buffer int32) in
   Float32_array.unsafe_get float32 0 *)
 
-let caml_int32_bits_of_float : float -> int32 = fun%raw x -> {| 
+let caml_int32_bits_of_float : float -> int32 = [%raw{|function(x){
   return new Int32Array(new Float32Array([x]).buffer)[0] 
-|}
+}|}]
   (* let float32 = Float32_array.make [|x|] in
   Int32_array.unsafe_get (Int32_array.fromBuffer (Float32_array.buffer float32)) 0 *)
 

jscomp/runtime/caml_format.ml

@@ -26,7 +26,7 @@
 
 
 
-
+ open Js_internalRaw
 
 (** *)
 
@@ -581,8 +581,11 @@ let caml_format_float fmt x =
     end;
   finish_formatting f s.contents
 
+
+
+
 let caml_hexstring_of_float : float -> int -> char -> string =    
-  fun%raw x prec style -> {| 
+  [%raw{|function(x,prec,style){
   if (!isFinite(x)) {
     if (isNaN(x)) return "nan";
     return x > 0 ? "infinity":"-infinity";
@@ -626,11 +629,11 @@ let caml_hexstring_of_float : float -> int -> char -> string =
     }
   }
   return  (sign_str + '0x' + x_str + 'p' + exp_sign + exp.toString(10));
-|}  
+}|}]  
 
 
 let float_of_string : string -> exn ->  float  = 
-    fun%raw s exn -> {| 
+    [%raw{|function(s,exn){
 
     var res = +s;
     if ((s.length > 0) && (res === res))
@@ -654,8 +657,8 @@ let float_of_string : string -> exn ->  float  =
     if (/^-inf(inity)?$/i.test(s))
         return -Infinity;
     throw exn;
-
-|}
+}
+|}]
 
 
 

jscomp/runtime/caml_int64.ml

@@ -24,7 +24,7 @@
 
 
 
-
+ open Js_internalRaw
 
 (* This module would  only work with js backend, since it requires
    [nativeint] behaves as js  numbers
@@ -429,9 +429,7 @@ let discard_sign (x : int64) : int64 =
 *)
 
 let float_of_bits ( x : t) : float =  
-   (fun%raw lo hi -> {|
-   return (new Float64Array(new Int32Array([lo,hi]).buffer))[0]
-   |} : _ -> _ -> _ ) x.lo x.hi 
+   ([%raw{|function(lo,hi){ return (new Float64Array(new Int32Array([lo,hi]).buffer))[0]}|}] : _ -> _ -> _ ) x.lo x.hi 
 
   (* let to_int32 (x : nativeint) = x |> Caml_nativeint_extern.to_int32
   in
@@ -444,7 +442,7 @@ let float_of_bits ( x : t) : float =
    Float64_array.unsafe_get (Float64_array.fromBuffer (Int32_array.buffer int32)) 0 *)
 
 let  bits_of_float : float -> t  = fun x -> 
-    let buf = [%raw{|new Int32Array(new Float64Array([x]).buffer)|}] in 
+    let buf = ([%raw{|function(x){return new Int32Array(new Float64Array([x]).buffer)}|}] : _ -> _) x in 
     mk ~lo:(fst buf) ~hi:(snd buf)
   (* let to_nat (x : int32) = x |> Caml_int32_extern.to_int |>  Caml_nativeint_extern.of_int in
 

jscomp/runtime/caml_io.ml

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-
+ open Js_internalRaw
 
 let stdin = Caml_undefined_extern.empty
 let stderr = Caml_undefined_extern.empty
@@ -77,9 +77,9 @@ let caml_ml_flush (oc : out_channel)  : unit =
       oc.buffer <- ""      
     end      
 
-let node_std_output  : string -> bool = fun%raw s -> {|
-   return (typeof process !== "undefined") && process.stdout && (process.stdout.write(s), true);
-|}
+let node_std_output  : string -> bool =  
+  [%raw{|function(s){ return (typeof process !== "undefined") && process.stdout && (process.stdout.write(s), true);}
+|}]
 
 
 (** note we need provide both [bytes] and [string] version 
@@ -88,9 +88,9 @@ let caml_ml_output (oc : out_channel) (str : string) offset len  =
   let str =
     if offset = 0 && len =Caml_string_extern.length str then str    
     else Caml_string_extern.slice str offset len in
-  if [%bs.raw{| (typeof process !== "undefined") && process.stdout && process.stdout.write |}] &&
+  if [%raw{| (typeof process !== "undefined") && process.stdout && process.stdout.write |}] &&
      oc == stdout then
-    ([%bs.raw{| process.stdout.write |}] : string -> unit [@bs] ) str [@bs]
+    ([%raw{| process.stdout.write |}] : string -> unit [@bs] ) str [@bs]
 
   else
     begin     

jscomp/runtime/caml_lexer.ml

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-
+ open Js_internalRaw
 
 type lex_tables 
 type lexbuf
@@ -104,7 +104,7 @@ function caml_lex_array(s) {
  * @param lexbuf
  * @returns {any}
  *)
-let caml_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int = fun%raw tbl start_state lexbuf exn -> {|
+let caml_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int = [%raw{|function (tbl, start_state, lexbuf, exn){
     // Lexing.lexbuf
     var lex_buffer = 'lex_buffer';
     var lex_buffer_len = 'lex_buffer_len';
@@ -186,7 +186,8 @@ let caml_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int = fun%raw tb
                 lexbuf[lex_eof_reached] = 0;
         }
     }
-|}
+}    
+|}]
 
 let empty_token_lit = "lexing: empty token"
 
@@ -252,7 +253,7 @@ function caml_lex_run_tag(s, i, mem) {
  *)
 
 
-let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= fun%raw tbl start_state lexbuf exn -> {|
+let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= [%raw{|function (tbl, start_state, lexbuf, exn) {
     // Lexing.lexbuf
     var lex_buffer = 'lex_buffer';
     var lex_buffer_len = 'lex_buffer_len';
@@ -357,7 +358,8 @@ let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= fun%raw
                 lexbuf[lex_eof_reached] = 0;
         }
     }
-|}
+    }
+|}]
 
 
 

jscomp/runtime/caml_obj.ml

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-
+ open Js_internalRaw
 
 
 
@@ -36,9 +36,9 @@ module O = struct
   external isArray : 'a -> bool = "Array.isArray" [@@bs.val]
   type key = string
   let for_in : (Caml_obj_extern.t -> (key -> unit) -> unit)  = 
-    fun%raw o foo ->  {|
-        for (var x in o) { foo(x) }
-      |}
+    [%raw{|function(o,foo){
+        for (var x in o) { foo(x) }}
+      |}]
 
   let hasOwnProperty (o: Caml_obj_extern.t) (key: key) : bool = (Obj.magic o)##hasOwnProperty(key)
   external get_value : Caml_obj_extern.t -> key -> Caml_obj_extern.t = ""[@@bs.get_index]
@@ -135,12 +135,13 @@ let caml_lazy_make (fn : _ -> _) =
    In most cases, rec value comes from record/modules, 
    whose tag is 0, we optimize that case
 *)
-let caml_update_dummy : _ -> _ -> unit= fun%raw x y -> {|
+let caml_update_dummy : _ -> _ -> unit= [%raw{|function(x,y){
   for (var k in y){
     x[k] = y[k]
   }
   return 0;
-|}
+  }
+|}]
 
 (* Caml_obj_extern.set_length x   (Caml_obj_extern.length y) *)
 (* [set_length] seems redundant here given that it is initialized as an array 

jscomp/runtime/caml_parser.ml

@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
+open Js_internalRaw
 
 (** *)
 
@@ -156,7 +156,8 @@ type parse_tables
 type parser_env 
 
 
-let caml_parse_engine : parse_tables -> parser_env -> (*Parsing.parser_input *)Caml_obj_extern.t -> Caml_obj_extern.t -> Caml_obj_extern.t = fun%raw tables (* parser_table *) env (* parser_env *) cmd (* parser_input*) arg (* Caml_obj_extern.t*) -> {|
+let caml_parse_engine : parse_tables -> parser_env -> (*Parsing.parser_input *)Caml_obj_extern.t -> Caml_obj_extern.t -> Caml_obj_extern.t = 
+    [%raw{|function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Caml_obj_extern.t*/) {
     var ERRCODE = 256;
     //var START = 0;
     //var TOKEN_READ = 1;
@@ -379,7 +380,7 @@ let caml_parse_engine : parse_tables -> parser_env -> (*Parsing.parser_input *)C
     env[env_state] = state;
     env[env_errflag] = errflag;
     return res;
-|} 
+}|}] 
 
 
 (**
@@ -388,8 +389,8 @@ let caml_parse_engine : parse_tables -> parser_env -> (*Parsing.parser_input *)C
  * @param {boolean}
  * @returns {boolean}
  *)
-let caml_set_parser_trace : bool -> bool = fun%raw v ->  {|
+let caml_set_parser_trace : bool -> bool = [%raw{|function (v) {
     var old = PARSER_TRACE;
     PARSER_TRACE = v;
     return old;
-|}
+}|}]