Toplevel: fix example

Author: hhugo

compiler/js_of_ocaml.ml

@@ -104,7 +104,7 @@ let f
             Filename.concat (Findlib.find_pkg_dir pkg) d'
         | None -> d)
   in
-  let expunge =
+  let exported_unit =
     match export_file with
     | None -> None
     | Some file ->
@@ -119,12 +119,7 @@ let f
            assert false
          with End_of_file -> ());
         close_in ic;
-        Some
-          (fun s ->
-            try
-              Hashtbl.find t s;
-              `Keep
-            with Not_found -> `Skip)
+        Some (Hashtbl.fold (fun cmi () acc -> cmi :: acc) t [])
   in
   Linker.load_files runtime_files;
   let paths =
@@ -247,7 +242,7 @@ let f
           Parse_bytecode.from_exe
             ~includes:paths
             ~toplevel
-            ?expunge
+            ?exported_unit
             ~dynlink
             ~debug:need_debug
             ic

compiler/lib/parse_bytecode.ml

@@ -2039,7 +2039,7 @@ let read_toc ic =
 let from_exe
     ?(includes = [])
     ?(toplevel = false)
-    ?(expunge = fun _ -> `Keep)
+    ?exported_unit
     ?(dynlink = false)
     ?(debug = `No)
     ic =
@@ -2068,9 +2068,9 @@ let from_exe
       Hashtbl.find keeps s;
       true
     with Not_found -> (
-      match expunge s with
-      | `Keep -> true
-      | `Skip -> false)
+      match exported_unit with
+      | Some l -> List.mem s ~set:l
+      | None -> false)
   in
   let crcs = List.filter ~f:(fun (unit, _crc) -> keep unit) orig_crcs in
   let symbols =
@@ -2193,6 +2193,14 @@ let from_exe
         StringSet.empty
     else StringSet.empty
   in
+  let cmis =
+    match exported_unit with
+    | None -> cmis
+    | Some l ->
+        if toplevel && Config.Flag.include_cmis ()
+        then List.fold_left l ~init:cmis ~f:(fun acc s -> StringSet.add s acc)
+        else cmis
+  in
   let code = prepend p body in
   Code.invariant code;
   {code; cmis; debug = debug_data}

compiler/lib/parse_bytecode.mli

@@ -40,7 +40,7 @@ type one =
 val from_exe :
      ?includes:string list
   -> ?toplevel:bool
-  -> ?expunge:(string -> [`Keep | `Skip])
+  -> ?exported_unit:string list
   -> ?dynlink:bool
   -> ?debug:[`Full | `Names | `No]
   -> in_channel

toplevel/bin/jsoo_common.ml

@@ -105,5 +105,11 @@ let cmis files =
   List.fold_left files ~init:[] ~f:(fun fs file ->
       match kind file with
       | `Pkg pkg -> cmis_of_package pkg @ fs
-      | `Cmi s -> read_cmi ~dir:"." s :: fs
+      | `Cmi s -> (
+        match String.split_char ~sep:':' s with
+        | [s] -> read_cmi ~dir:"." s :: fs
+        | [pkg; s] ->
+            let dir = Findlib.package_directory pkg in
+            read_cmi ~dir s :: fs
+        | [] | _ :: _ :: _ :: _ -> assert false)
       | `Cma s -> cmis_of_cma ~dir:"." s @ fs)

toplevel/examples/lwt_toplevel/dune

@@ -59,13 +59,12 @@
       js_of_ocaml.deriving
       lwt bigarray
       tyxml.functor
+      tyxml.functor:html_types.cmi
       react reactiveData
       js_of_ocaml js_of_ocaml-lwt
       js_of_ocaml-tyxml
       js_of_ocaml-toplevel
       dynlink
-;;    FIX: html_types is missing
-;;    html_types.cmi
       )))
 
 (rule

toplevel/examples/lwt_toplevel/examples.ml

@@ -1,4 +1,5 @@
 (** Overview *)
+
 let x = 10 + 10
 
 let y = x * 3
@@ -14,6 +15,7 @@ let _ = Printf.printf "fact 20 = %f\n" (fact 20)
 let _ = "abc" < "def"
 
 (** Mutually recursive function *)
+
 let rec even n =
   match n with
   | 0 -> true
@@ -25,6 +27,7 @@ and odd n =
   | x -> even (x - 1)
 
 (** Mutually recursive module *)
+
 module rec Odd : sig
   val odd : int -> bool
 end = struct
@@ -91,22 +94,24 @@ let div_elt =
 
 let _ = display div_elt
 
-open Graphics_js
 (** Graphics: Draw *)
 
+open Graphics_js
+
 let () = loop [Mouse_motion] (function {mouse_x = x; mouse_y = y} -> fill_circle x y 5)
 
-open Graphics_js
 (** Graphics: Draw chars*)
 
+open Graphics_js
+
 let () =
   loop [Mouse_motion; Key_pressed] (function {mouse_x = x; mouse_y = y; key} ->
       moveto x y;
       draw_char key)
 
-open Js_of_ocaml_lwt
 (** Graphics: PingPong *)
 
+open Js_of_ocaml_lwt
 open Graphics_js
 
 let c = 3