refactor

ocsigen · Jul 14, 2019 · 0f5567c · 0f5567c
1 parent 1968e81
commit 0f5567c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 3 deletions.
diff --git a/toplevel/lib/dune b/toplevel/lib/dune
@@ -3,7 +3,7 @@
   (public_name js_of_ocaml-toplevel)
   (synopsis "Js_of_ocaml toplevel library")
   (wrapped (transition "Will be removed past 2019-04-01"))
-  (libraries lwt
+  (libraries
     js_of_ocaml-compiler js_of_ocaml bytes
     compiler-libs.bytecomp compiler-libs.toplevel)
   (preprocess (pps js_of_ocaml-ppx)))
diff --git a/toplevel/lib/js_of_ocaml_toplevel.ml b/toplevel/lib/js_of_ocaml_toplevel.ml
@@ -18,3 +18,5 @@
  *)
 
 module JsooTop = JsooTop
+module JsooTopWrapped = JsooTopWrapped
+module JsooTopIntf = JsooTopIntf
diff --git a/toplevel/lib/jsooTopAsynchronous.ml → toplevel/lib/lwt/jsooTopAsynchronous.ml b/toplevel/lib/jsooTopAsynchronous.ml → toplevel/lib/lwt/jsooTopAsynchronous.ml
@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 open Js_of_ocaml
+open! Js_of_ocaml_toplevel
 open JsooTopWorkerIntf
 
 type 'a result = 'a JsooTopWrapped.result Lwt.t

diff --git a/toplevel/lib/jsooTopAsynchronous.mli → toplevel/lib/lwt/jsooTopAsynchronous.mli b/toplevel/lib/jsooTopAsynchronous.mli → toplevel/lib/lwt/jsooTopAsynchronous.mli
@@ -16,6 +16,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_of_ocaml_toplevel
 
 type toplevel
 

diff --git a/toplevel/lib/jsooTopWorker.ml → toplevel/lib/lwt/jsooTopWorker.ml b/toplevel/lib/jsooTopWorker.ml → toplevel/lib/lwt/jsooTopWorker.ml
@@ -18,6 +18,7 @@
  *)
 
 open Js_of_ocaml
+open! Js_of_ocaml_toplevel
 open JsooTopWorkerIntf
 
 type 'a return =

diff --git a/toplevel/lib/jsooTopWorker.mli → toplevel/lib/lwt/jsooTopWorker.mli b/toplevel/lib/jsooTopWorker.mli → toplevel/lib/lwt/jsooTopWorker.mli
diff --git a/toplevel/lib/jsooTopWorkerIntf.ml → toplevel/lib/lwt/jsooTopWorkerIntf.ml b/toplevel/lib/jsooTopWorkerIntf.ml → toplevel/lib/lwt/jsooTopWorkerIntf.ml
@@ -16,7 +16,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_of_ocaml_toplevel
 open Js_of_ocaml
 
 (** Types of the messages exchanged with a toplevel in a Web Worker. *)

diff --git a/toplevel/lib/jsooTopWorkerIntf.mli → toplevel/lib/lwt/jsooTopWorkerIntf.mli b/toplevel/lib/jsooTopWorkerIntf.mli → toplevel/lib/lwt/jsooTopWorkerIntf.mli
@@ -16,7 +16,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_of_ocaml_toplevel
 open Js_of_ocaml
 
 (** Types of the messages exchanged with a toplevel in a Web Worker. *)