Merge pull request #635 from bloomberg/upgrade

rename Js_array to Js_arr to avoid  conflict with runtime module name

Author: bobzhang

jscomp/core.mllib

@@ -50,7 +50,7 @@ lam_group
 j
 js_ast_util
 
-js_array
+js_arr
 js_program_loader
 js_output
 js_dump

jscomp/foo.itarget

@@ -4,4 +4,5 @@ syntax/syntax.cmxa
 core.cmxa
 depends/depends.cmxa
 bs_ppx_main.cmx
-ocamlpack_main.cmx
+ocamlpack_main.cmx
+jsoo_main.cmo

jscomp/js.sh

@@ -3,8 +3,10 @@ set -e
 ## building js 
 # ocamlbuild -use-ocamlfind -no-hygiene  -syntax camlp4o -pkgs js_of_ocaml,js_of_ocaml.syntax,js_of_ocaml.toplevel exports.byte
 
-ocamlbuild -lflags -no-check-prims -use-ocamlfind -no-hygiene   -pkgs compiler-libs.bytecomp -no-links jsoo_exports.byte
-js_of_ocaml -I +compiler-libs --toplevel +dynlink.js +toplevel.js +weak.js  _build/jsoo_exports.byte -I ./runtime/ --file js.cmi:/cmis --file js_unsafe.cmi:/cmis --file js_re.cmi:/cmis   -o _build/exports.js 
+ocamlbuild -lflags -no-check-prims -use-ocamlfind -no-hygiene   -pkgs compiler-libs.bytecomp -no-links jsoo_main.byte
+
+# jsoo_mkcmis stdlib
+js_of_ocaml -I +compiler-libs   --toplevel +weak.js +toplevel.js  ./polyfill.js _build/jsoo_main.byte -I ./runtime/ --file js.cmi:/cmis/js.cmi --file js_unsafe.cmi:/cmis/js_unsafe.cmi --file js_re.cmi:/cmis/js_re.cmi   -o _build/exports.js 
 
 rm -rf $BUCKLESCRIPT_DOC/js-demo/exports.js && cp _build/exports.js  $BUCKLESCRIPT_DOC/js-demo/
 

jscomp/js_array.ml renamed to jscomp/js_arr.ml

@@ -105,6 +105,60 @@ let compile  : string -> string = string_of_fmt (implementation false)
 let shake_compile : string -> string = string_of_fmt (implementation true)
 
 
+(** *)
+module Js = struct
+  module Unsafe = struct
+    type any
+    external inject : 'a -> any = "%identity"
+    external get : 'a -> 'b -> 'c = "caml_js_get"
+    external set : 'a -> 'b -> 'c -> unit = "caml_js_set"
+    external pure_js_expr : string -> 'a = "caml_pure_js_expr"
+    let global = pure_js_expr "joo_global_object"
+    external obj : (string * any) array -> 'a = "caml_js_object"
+  end
+  type (-'a, +'b) meth_callback
+  type 'a callback = (unit, 'a) meth_callback
+  external wrap_callback : ('a -> 'b) -> ('c, 'a -> 'b) meth_callback = "caml_js_wrap_callback"
+  external wrap_meth_callback : ('a -> 'b) -> ('a, 'b) meth_callback = "caml_js_wrap_meth_callback"
+  type + 'a t 
+  type js_string
+  external string : string -> js_string t = "caml_js_from_string"
+  external to_string : js_string t -> string = "caml_js_to_string"
+end
+
+
+let export (field : string) v = 
+  Js.Unsafe.set (Js.Unsafe.global) field v
+;;
+ 
+(* To add a directory to the load path *)
+
+let dir_directory d =
+  Config.load_path := d :: !Config.load_path
+
+
+let () = 
+  dir_directory "/cmis"
+
+
+
+let _ =
+  export "ocaml"
+    (Js.Unsafe.(obj
+                  [|"compile",
+                    inject @@ 
+                    Js.wrap_meth_callback
+                      (fun _ code ->
+                         Js.string (compile (Js.to_string code)));
+                    "shake_compile",
+                    inject @@ 
+                    Js.wrap_meth_callback
+                      (fun _ code ->
+                         Js.string (shake_compile (Js.to_string code)));
+                    "version", Js.Unsafe.inject (Js.string (Js_config.version))
+                  |]))
+
+
 (* local variables: *)
 (* compile-command: "ocamlbuild -use-ocamlfind -pkg compiler-libs -no-hygiene driver.cmo" *)
 (* end: *)

jscomp/js_array.mli renamed to jscomp/js_arr.mli

@@ -0,0 +1,23 @@
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * 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. *)

jscomp/jsoo_exports.ml

@@ -307,7 +307,7 @@ and compile_recursive_let
           match x with  
           | Lam.Lvar lid
             -> S.exp 
-                 (Js_array.set_array (E.var id) (E.int (Int32.of_int i)) (E.var lid))
+                 (Js_arr.set_array (E.var id) (E.int (Int32.of_int i)) (E.var lid))
           | _ -> assert false
          ) ls)
     ), []

jscomp/jsoo_driver.ml renamed to jscomp/jsoo_main.ml

@@ -236,14 +236,14 @@ let translate_ffi (ffi : Ast_external_attributes.ffi ) prim_name
       -> 
       begin match args with
         | [obj; v ] -> 
-          Js_array.ref_array obj v
+          Js_arr.ref_array obj v
         | _ -> assert false 
       end
     | Js_set_index 
       -> 
       begin match args with 
       | [obj; v ; value] -> 
-        Js_array.set_array obj v value
+        Js_arr.set_array obj v value
       | _ -> assert false
       end