import Oxcaml JSOO changes

Author: jvanburen

.gitignore

@@ -56,3 +56,8 @@ toplevel/examples/lwt_toplevel_bin/toplevel.js
 toplevel/examples/lwt_toplevel_bin/eval.js
 
 janestreet
+.local-merlin-binaries
+.local-ocaml-lib
+_install
+*.orig
+*.rej

compiler/bin-js_of_ocaml/build_fs.ml

@@ -51,9 +51,11 @@ let f { files; output_file; include_dirs } =
     {|
 //Provides: jsoo_create_file_extern
 function jsoo_create_file_extern(name,content){
-  if(globalThis.jsoo_create_file)
+  if (globalThis.jsoo_create_file) {
     globalThis.jsoo_create_file(name,content);
-  else {
+  } else if (globalThis.caml_create_file) {
+    globalThis.caml_create_file(name,content);
+  } else {
     if(!globalThis.jsoo_fs_tmp) globalThis.jsoo_fs_tmp = [];
     globalThis.jsoo_fs_tmp.push({name:name,content:content});
   }

compiler/bin-js_of_ocaml/check_runtime.ml

@@ -63,20 +63,15 @@ let f (runtime_files, bytecode, target_env) =
   Linker.check_deps ();
   let all_prims =
     List.concat_map bytecode ~f:(fun f ->
+       (
         let ic = open_in_bin f in
         let prims =
-          match Parse_bytecode.from_channel ic with
-          | `Cmo x -> x.Cmo_format.cu_primitives
-          | `Cma x ->
-              List.concat_map
-                ~f:(fun x -> x.Cmo_format.cu_primitives)
-                x.Cmo_format.lib_units
-          | `Exe ->
-              let toc = Parse_bytecode.Toc.read ic in
-              Parse_bytecode.read_primitives toc ic
+          Fun.protect (fun () ->
+          (* CR jvanburen: fix this once by reading .cmj files. *)
+          failwith "Unimplemented")
+            ~finally:(fun () -> close_in ic)
         in
-        close_in ic;
-        List.map ~f:(fun p -> p, f) prims)
+        List.map ~f:(fun p -> p, f) prims))
   in
   let _percent_prim, needed =
     List.partition all_prims ~f:(fun (x, _) -> Char.equal (String.get x 0) '%')

compiler/bin-js_of_ocaml/cmd_arg.ml

@@ -59,7 +59,7 @@ type t =
   ; no_runtime : bool
   ; include_runtime : bool
   ; output_file : [ `Name of string | `Stdout ] * bool
-  ; bytecode : [ `File of string | `Stdin | `None ]
+  ; input : [ `Filename of string | `None ]
   ; params : (string * string) list
   ; static_env : (string * string) list
   ; wrap_with_fun : [ `Iife | `Named of string | `Anonymous ]
@@ -116,8 +116,7 @@ let options =
   in
   let input_file =
     let doc =
-      "Compile the bytecode program [$(docv)]. "
-      ^ "Use '-' to read from the standard input instead."
+      "Compile the JSOO file (.cmj) or archive (.cmja) [$(docv)]."
     in
     Arg.(required & pos ~rev:true 0 (some string) None & info [] ~docv:"PROGRAM" ~doc)
   in
@@ -314,19 +313,12 @@ let options =
     let chop_extension s = try Filename.chop_extension s with Invalid_argument _ -> s in
     let runtime_files = js_files in
     let fs_external = fs_external || (toplevel && no_cmis) in
-    let bytecode =
-      match input_file with
-      | "-" -> `Stdin
-      | x -> `File x
-    in
+    let input = `Filename input_file in
     let output_file =
       match output_file with
       | Some "-" -> `Stdout, true
       | Some s -> `Name s, true
-      | None -> (
-          match bytecode with
-          | `File s -> `Name (chop_extension s ^ ".js"), false
-          | `Stdin -> `Stdout, false)
+      | None -> `Name (chop_extension input_file ^ ".js"), false
     in
     let source_map =
       if (not no_sourcemap) && (sourcemap || sourcemap_inline_in_js)
@@ -376,7 +368,7 @@ let options =
       ; fs_external
       ; no_cmis
       ; output_file
-      ; bytecode
+      ; input
       ; source_map
       ; keep_unit_names
       ; effects
@@ -629,7 +621,7 @@ let options_runtime_only =
       ; fs_external
       ; no_cmis
       ; output_file
-      ; bytecode = `None
+      ; input = `None
       ; source_map
       ; keep_unit_names = false
       ; effects

compiler/bin-js_of_ocaml/cmd_arg.mli

@@ -28,7 +28,7 @@ type t =
   ; no_runtime : bool
   ; include_runtime : bool
   ; output_file : [ `Name of string | `Stdout ] * bool
-  ; bytecode : [ `File of string | `Stdin | `None ]
+  ; input : [ `Filename of string | `None ]
   ; params : (string * string) list
   ; static_env : (string * string) list
   ; wrap_with_fun :