Merge pull request #628 from bloomberg/better_top

Better top with Js support !

Author: bobzhang

jscomp/bin/bs_ppx.ml

@@ -1,4 +1,4 @@
-(** Bundled by ocamlpack 08/11-11:32 *)
+(** Bundled by ocamlpack 08/11-22:12 *)
 module String_map : sig 
 #1 "string_map.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2923,6 +2923,7 @@ let runtime_set =
     array ;
     format ;
     string ;
+    bytes;
     float ;
     hash ;
     oo ;

jscomp/bin/compiler.ml

@@ -1,4 +1,4 @@
-(** Bundled by ocamlpack 08/11-11:32 *)
+(** Bundled by ocamlpack 08/11-22:12 *)
 module String_map : sig 
 #1 "string_map.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2923,6 +2923,7 @@ let runtime_set =
     array ;
     format ;
     string ;
+    bytes;
     float ;
     hash ;
     oo ;

jscomp/common/js_config.ml

@@ -269,6 +269,7 @@ let runtime_set =
     array ;
     format ;
     string ;
+    bytes;
     float ;
     hash ;
     oo ;

jscomp/js.sh

@@ -3,11 +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.toplevel -no-links jsoo_exports.byte
-js_of_ocaml -I +compiler-libs --toplevel +dynlink.js +toplevel.js +weak.js  _build/jsoo_exports.byte -o _build/exports.js 
+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 
 
-
-rm -rf $BUCKLESCRIPT_DOC/js-demo/exports.js && cp _build/exports.js $BUCKLESCRIPT_DOC/js-demo/exports.js
+rm -rf $BUCKLESCRIPT_DOC/js-demo/exports.js && cp _build/exports.js  $BUCKLESCRIPT_DOC/js-demo/
 
 ocamlbuild -use-ocamlfind -no-hygiene -no-links js_generate_require.byte --
 rm -rf  $BUCKLESCRIPT_DOC/js-demo/pre_load.js

jscomp/js_generate_require.ml

@@ -39,7 +39,7 @@ let () =
   Ext_pervasives.with_file_as_chan "./pre_load.js" 
     (fun chan -> 
        output_string chan 
-         (Printf.sprintf "require([%s], function(){})" 
+         (Printf.sprintf "function start(gist){require([%s], function(){loadGist(gist)})}" 
             (String.concat "," 
                (List.map (Printf.sprintf "%S" )
                   (std_files @ runtime_files)

jscomp/jsoo_exports.ml

@@ -53,12 +53,17 @@ 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 () = 
-  Sys.interactive := false;
-  Topdirs.dir_directory "/cmis";
-  Toploop.initialize_toplevel_env ();
-  Toploop.input_name := "//toplevel//";
+  Sys.interactive := false; (* TODO: remove *)
+  dir_directory "/cmis";
+  (* Toploop.initialize_toplevel_env (); *)
+  (* Toploop.input_name := "//toplevel//"; *)
   Sys.interactive := true