Bump to OCaml 5.1

Author: Jean-Baptiste Doderlein

src/index.html

@@ -49,7 +49,7 @@
         let params = new URLSearchParams(window.location.search);
         let version = params.get("version");
 
-        let versions = ["4.14.1", "4.14.0", "4.13.1", "4.13.0", "4.12.1", "4.12.0", "4.11.2", "4.11.1", "4.11.0", "4.10.2", "4.10.1", "4.10.0", "4.09.1", "4.09.0", "4.08.1", "4.08.0", "4.07.1", "4.07.0", "4.06.1", "4.06.0"];
+        let versions = ["5.1.0", "4.14.1", "4.14.0", "4.13.1", "4.13.0", "4.12.1", "4.12.0", "4.11.2", "4.11.1", "4.11.0", "4.10.2", "4.10.1", "4.10.0", "4.09.1", "4.09.0", "4.08.1", "4.08.0", "4.07.1", "4.07.0", "4.06.1", "4.06.0"];
 
         if (!versions.includes(version)) {
             version = versions[0];

toplevel_build/compile.sh

@@ -90,8 +90,9 @@ Build_Toplevel () {
     cp _build/default/toplevel.js "$OUTPUT_DIR/toplevel-$BUILD_VERSION.js"
 
     # Clean after build
-    rm -rf "_build"
     dune clean
+    
+    
 }
 
 Usage () {
@@ -113,7 +114,7 @@ Usage () {
 
 # These are all the known to work versions
 # You can edit this to try older versions but we cannot guarantee it will work
-SUPPORTED_OCAML_VERSIONS=(4.14.1 4.14.0 4.13.1 4.13.0 4.12.1 4.12.0 4.11.2 4.11.1 4.11.0 4.10.2 4.10.1 4.10.0 4.09.1 4.09.0 4.08.1 4.08.0 4.07.1 4.07.0 4.06.1 4.06.0)
+SUPPORTED_OCAML_VERSIONS=(5.1.0 4.14.1 4.14.0 4.13.1 4.13.0 4.12.1 4.12.0 4.11.2 4.11.1 4.11.0 4.10.2 4.10.1 4.10.0 4.09.1 4.09.0 4.08.1 4.08.0 4.07.1 4.07.0 4.06.1 4.06.0)
 
 KEEP=false
 FORCE=false

toplevel_build/dune

@@ -10,14 +10,28 @@
     ocp-indent.lib
     lwt
     ;; not used directly
-    graphics
-    bigarray
-    zarith
     str
+    zarith
+    dynlink
   )
-  (flags (:standard -rectypes -linkall))
+  (flags 
+    (:standard -rectypes -linkall))
   (modes byte)
   (modules (:standard))
+  (js_of_ocaml
+    (link_flags (:standard))
+    (build_runtime_flags
+    (:standard
+      +base/runtime.js
+      +toplevel.js
+      +dynlink.js
+      +zarith_stubs_js/runtime.js
+      +zarith_stubs_js/biginteger.js
+      ))
+    (flags
+    (:standard
+      --toplevel))
+  )
   (preprocess (pps sedlex.ppx js_of_ocaml-ppx))
 )
 
@@ -26,11 +40,9 @@
   (action
     (run jsoo_listunits -o %{targets}
       stdlib
-      graphics
       str
-      bigarray
-      zarith
       dynlink
+      zarith
     )
   )
 )
@@ -39,16 +51,15 @@
   (targets toplevel.js)
   (action
     (run %{bin:js_of_ocaml}
-      -I %{lib:reactiveData:.}
-      -I %{lib:zarith:.}
-      --export %{dep:export.txt}
-      --toplevel
-      --opt 3
       +base/runtime.js
       +toplevel.js
       +dynlink.js
-      +zarith_stubs_js/biginteger.js
       +zarith_stubs_js/runtime.js
+      +zarith_stubs_js/biginteger.js
+      --export %{dep:export.txt}
+      --toplevel
+      --opt 3
+      --enable=effects
       %{dep:toplevel.bc}
       -o %{targets}
     )

toplevel_build/dune-project

@@ -1 +1 @@
-(lang dune 2.9)
+(lang dune 3.14)

toplevel_build/toplevel.ml

@@ -173,8 +173,6 @@ module Ppx_support = struct
 end
 
 module Version = struct
-  type t = int list
-  
   let from_string v = List.map int_of_string (String.split_on_char '.' v)
 
   let rec comp v v' = match v, v' with
@@ -247,8 +245,6 @@ let by_id s = Dom_html.getElementById s
 
 let by_id_coerce s f = Js.Opt.get (f (Dom_html.getElementById s)) (fun () -> raise Not_found)
 
-let do_by_id s f = try f (Dom_html.getElementById s) with Not_found -> ()
-
 (* load file using a synchronous XMLHttpRequest *)
 let load_resource_aux filename url =
   Js_of_ocaml_lwt.XmlHttpRequest.perform_raw ~response_type:XmlHttpRequest.ArrayBuffer url
@@ -339,8 +335,11 @@ let highlight_location loc =
         let to_ = if !x = line2 then `Pos col2 else `Last in
         Colorize.highlight from_ to_ e)
 
-let append colorize output cl s =
-  Dom.appendChild output (Tyxml_js.To_dom.of_element (colorize ~a_class:cl s))
+let append colorize output cl (s:string) =
+  if String.length s > 0 then
+    Dom.appendChild output (Tyxml_js.To_dom.of_element (colorize ~a_class:cl s))
+  else 
+    Dom.appendChild output (Tyxml_js.To_dom.of_element (colorize ~a_class:cl "empty output"))
 
 let append_to_console s =
   Firebug.console##log (Js.string s)