web interface fixes

.merlin

@@ -11,6 +11,6 @@ PKG lem lem_num lem_zarith
 PKG linksem linksem_num linksem_zarith
 PKG uint zarith
 PKG lambda-term zed lwt react
-PKG js_of_ocaml js_of_ocaml.ppx
+PKG js_of_ocaml js_of_ocaml-ppx
 PKG base64
 PKG sail

_tags

@@ -39,7 +39,7 @@
 #
 # files that use js_of_ocaml special syntax:
 #
-<src_top/web/*.{ml,mli}> or <src_top/webppc.ml> : package(js_of_ocaml), package(js_of_ocaml.ppx)
+<src_top/web/*.{ml,mli}> or <src_top/webppc.ml> : package(js_of_ocaml), package(js_of_ocaml-ppx)
 
 #
 # library dependencies:

opam

@@ -8,7 +8,7 @@ The rmem tool comprises executable operational models for the relaxed-memory con
 maintainer: "rmem devs <[email protected]>"
 authors: "authors"
 license: ""
-homepage: ""
+homepage: "https://github.com/rems-project/rmem"
 bug-reports: ""
 dev-repo: "git+https://github.com/rems-project/rmem.git"
 depends: [ 

src_top/pp.ml

@@ -369,7 +369,7 @@ let pp_pretty_eiid m eiid =
 (** ******************* *)
 
 
-(* js_of_ocaml cann't use Str.split (or Str in general), use the
+(* js_of_ocaml can't use Str.split (or Str in general), use the
    following function instead.
    split del str splits str into substrings, taking as delimiters the
    substrings del, and returns the list of substrings. An occurrence

src_top/web/files.ml

@@ -17,7 +17,10 @@
 
 let sources = ref ([] : (string * string array) list)
 
+open Js_of_ocaml
+
 let update_sources new_sources =
+  let open Js_of_ocaml in
   (* Ew, javascript (again) *)
   let objects = Array.to_list (Js.to_array new_sources) in
   sources := List.map

src_top/web/graphviz.ml

@@ -16,6 +16,8 @@
 (*                                                                               *)
 (*===============================================================================*)
 
+open Js_of_ocaml
+
 module Make (ConcModel: Concurrency_model.S)
     : (GraphBackend.S with type ui_trans = ConcModel.ui_trans 
                       and type instruction_ast = ConcModel.instruction_ast)

src_top/web/interact.mli

@@ -14,6 +14,8 @@
 (*                                                                               *)
 (*===============================================================================*)
 
+open Js_of_ocaml
+
 (* val exit_on_bad_fetch : Globals.ppmode -> MachineDefTypes.trans -> unit *)
 
 (* The info structure of state of search procedure *)

src_top/web/screen.ml

@@ -18,6 +18,7 @@
 (*===============================================================================*)
 
 open Params
+open Js_of_ocaml
 
 let set_state_output str = ()
 let set_trace_output str = ()

src_top/webppc.ml

@@ -23,6 +23,7 @@
 
 open InstructionSemantics
 open Params
+open Js_of_ocaml
 
 let js = Js.string;;
 let document = Dom_html.window##.document;;