Misc: specify interfaces for tyxml and toplevel.

hhugo · hhugo · commit 198b3833c179 · 2017-06-18T08:34:54.000+01:00
diff --git a/examples/cubes/cubes.ml b/examples/cubes/cubes.ml
@@ -17,6 +17,8 @@
  * 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
+open Js_of_ocaml_lwt
 
 let n = 12
 
diff --git a/examples/planet/planet.ml b/examples/planet/planet.ml
@@ -46,7 +46,8 @@ Stop animation when not visible!
 http://visibleearth.nasa.gov/view_rec.php?id=2431
 http://maps.jpl.nasa.gov/
 *)
-
+open Js_of_ocaml
+open Js_of_ocaml_lwt
 
 let width = 600
 let height = width
diff --git a/examples/webgl/webgldemo.ml b/examples/webgl/webgldemo.ml
@@ -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
 open Js_of_ocaml_lwt
 open Lwt
 open Js
diff --git a/examples/wiki/main.ml b/examples/wiki/main.ml
@@ -16,7 +16,9 @@
  * 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.
- *)
+*)
+open Js_of_ocaml
+open Js_of_ocaml_lwt
 module Html = Dom_html
 
 let (>>=) = Lwt.bind
diff --git a/examples/wysiwyg/main.ml b/examples/wysiwyg/main.ml
@@ -16,7 +16,8 @@
  * 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
+open Js_of_ocaml_lwt
 module Html = Dom_html
 
 let (>>=) = Lwt.bind
diff --git a/lib/lwt/graphics/graphics_js.ml b/lib/lwt/graphics/graphics_js.ml
@@ -18,6 +18,7 @@
  *)
 
 open Js_of_ocaml
+open Js_of_ocaml_lwt
 include Graphics
 
 type context
diff --git a/lib/lwt/graphics/jbuild b/lib/lwt/graphics/jbuild
@@ -4,5 +4,5 @@
   (public_name js_of_ocaml-lwt.graphics)
   (synopsis "Graphics for js_of_ocaml.")
   (optional)
-  (libraries (js_of_ocaml-lwt lwt graphics))
+  (libraries (js_of_ocaml js_of_ocaml-lwt lwt graphics))
   (preprocess (pps (js_of_ocaml-ppx)))))
diff --git a/lib/lwt/js_of_ocaml_lwt.ml b/lib/lwt/js_of_ocaml_lwt.ml
@@ -28,3 +28,7 @@ module File = struct
 end
 
 module Jsonp = Lwt_jsonp
+
+module Lwt_js = Lwt_js
+
+module Lwt_js_events = Lwt_js_events
diff --git a/lib/tyxml/js_of_ocaml_tyxml.ml b/lib/tyxml/js_of_ocaml_tyxml.ml
@@ -0,0 +1,22 @@
+(* Js_of_ocaml library
+ * http://www.ocsigen.org/js_of_ocaml/
+ * Copyright (C) 2017 Hugo Heuzard
+ *
+ * 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, with linking exception;
+ * either version 2.1 of the License, or (at your option) any 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.
+ *)
+
+module Tyxml_js = Tyxml_js
+module Tyxml_cast = Tyxml_cast
+module Tyxml_cast_sigs = Tyxml_cast_sigs
diff --git a/toplevel/examples/lwt_toplevel_lib/colorize.mli b/toplevel/examples/lwt_toplevel_lib/colorize.mli
@@ -1,4 +1,5 @@
 open Js_of_ocaml
+open Js_of_ocaml_tyxml
 val text  : a_class:string -> string
 	    -> [> Html_types.div_content ] Tyxml_js.Html.elt
 
diff --git a/toplevel/examples/lwt_toplevel_lib/colorize_fake.ml.in b/toplevel/examples/lwt_toplevel_lib/colorize_fake.ml.in
@@ -1,4 +1,5 @@
 open Js_of_ocaml
+open Js_of_ocaml_tyxml
 
 let text ~a_class:cl s =
   Tyxml_js.Html.(span ~a:[a_class [cl]] [pcdata s])
diff --git a/toplevel/examples/lwt_toplevel_lib/toplevel.ml b/toplevel/examples/lwt_toplevel_lib/toplevel.ml
@@ -20,6 +20,8 @@
 
 open Js_of_ocaml
 open Js_of_ocaml_lwt
+open Js_of_ocaml_tyxml
+open Js_of_ocaml_toplevel
 open Lwt
 
 let compiler_name = "OCaml"
diff --git a/toplevel/lib/camlp4/js_of_ocaml_toplevel_camlp4.ml b/toplevel/lib/camlp4/js_of_ocaml_toplevel_camlp4.ml
@@ -51,7 +51,7 @@ let wrap parse_fun lb =
       | Loc.Exc_located (loc, x) ->
         let loc = Loc.to_ocaml_location loc in
         Toploop.print_location Format.err_formatter loc;
-        x, JsooTopError.Camlp4 (loc, x)
+        x, Js_of_ocaml_toplevel.For_js_of_ocaml_toplevel_camlp4.camlp4_exception (loc, x)
       | x ->
         x, x
     in
diff --git a/toplevel/lib/js_of_ocaml_toplevel.ml b/toplevel/lib/js_of_ocaml_toplevel.ml
@@ -0,0 +1,23 @@
+(* Js_of_ocaml library
+ * http://www.ocsigen.org/js_of_ocaml/
+ * Copyright (C) 2017 Hugo Heuzard
+ *
+ * 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, with linking exception;
+ * either version 2.1 of the License, or (at your option) any 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.
+ *)
+
+module JsooTop = JsooTop
+module For_js_of_ocaml_toplevel_camlp4 = struct
+  let camlp4_exception (loc, exn) = JsooTopError.Camlp4 (loc, exn)
+end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`open Js_of_ocaml`
	`2`	`+open Js_of_ocaml_tyxml`
`2`	`3`	`val text : a_class:string -> string`
`3`	`4`	`-> [> Html_types.div_content ] Tyxml_js.Html.elt`
`4`	`5`