Misc: fix for OCaml 5.4

Author: hhugo

compiler/lib/magic_number.ml

@@ -73,11 +73,12 @@ let v =
   | 5 :: 01 :: _ -> 33
   | 5 :: 02 :: _ -> 34
   | 5 :: 03 :: _ -> 35
+  | 5 :: 04 :: _ -> 36
   | _ ->
       if Ocaml_version.compare current [ 4; 13 ] < 0
       then failwith "OCaml version unsupported. Upgrade to OCaml 4.13 or newer."
       else (
-        assert (Ocaml_version.compare current [ 5; 4 ] >= 0);
+        assert (Ocaml_version.compare current [ 5; 5 ] >= 0);
         failwith "OCaml version unsupported. Upgrade js_of_ocaml.")
 
 let current_exe = "Caml1999X", v

lib/js_of_ocaml/dom.ml

@@ -333,7 +333,7 @@ class type event_listener_options = object
   method passive : bool t writeonly_prop
 end
 
-let addEventListenerWithOptions (e : (< .. > as 'a) t) typ ?capture ?once ?passive h =
+let addEventListenerWithOptions (e : < .. > t) typ ?capture ?once ?passive h =
   if not (Js.Optdef.test (Js.Unsafe.coerce e)##.addEventListener)
   then
     let ev = (Js.string "on")##concat typ in
@@ -353,7 +353,7 @@ let addEventListenerWithOptions (e : (< .. > as 'a) t) typ ?capture ?once ?passi
     let () = (Js.Unsafe.coerce e)##addEventListener typ h opts in
     fun () -> (Js.Unsafe.coerce e)##removeEventListener typ h opts
 
-let addEventListener (e : (< .. > as 'a) t) typ h capt =
+let addEventListener (e : < .. > t) typ h capt =
   addEventListenerWithOptions e typ ~capture:capt h
 
 let removeEventListener id = id ()

lib/js_of_ocaml/dom_html.mli

@@ -2593,7 +2593,7 @@ val removeEventListener : event_listener_id -> unit
 (** Remove the given event listener. *)
 
 val addMousewheelEventListenerWithOptions :
-     (#eventTarget t as 'a)
+     #eventTarget t
   -> ?capture:bool t
   -> ?once:bool t
   -> ?passive:bool t
@@ -2605,7 +2605,7 @@ val addMousewheelEventListenerWithOptions :
       means down / right. *)
 
 val addMousewheelEventListener :
-     (#eventTarget t as 'a)
+     #eventTarget t
   -> (mouseEvent t -> dx:int -> dy:int -> bool t)
   -> bool t
   -> event_listener_id

runtime/js/array.js

@@ -80,6 +80,18 @@ function caml_array_concat(l) {
   return a;
 }
 
+//Provides: caml_floatarray_concat mutable
+//Version: >= 5.4
+function caml_floatarray_concat(l) {
+  var a = [0];
+  while (l !== 0) {
+    var b = l[1];
+    for (var i = 1; i < b.length; i++) a.push(b[i]);
+    l = l[2];
+  }
+  return a;
+}
+
 //Provides: caml_array_blit
 function caml_array_blit(a1, i1, a2, i2, len) {
   if (i2 <= i1) {

runtime/js/domain.js

@@ -31,6 +31,13 @@ function caml_atomic_load(ref) {
   return ref[1];
 }
 
+//Provides: caml_atomic_load_field
+//Version: >= 5.4
+function caml_atomic_load_field(b,i) {
+  return b[i + 1];
+}
+
+
 //Provides: caml_atomic_cas
 //Version: >= 5
 function caml_atomic_cas(ref, o, n) {
@@ -41,6 +48,16 @@ function caml_atomic_cas(ref, o, n) {
   return 0;
 }
 
+//Provides: caml_atomic_cas_field
+//Version: >= 5.4
+function caml_atomic_cas_field(b, i, o, n) {
+  if (b[i + 1] === o) {
+    b[i + 1] = n;
+    return 1;
+  }
+  return 0;
+}
+
 //Provides: caml_atomic_fetch_add
 //Version: >= 5
 function caml_atomic_fetch_add(ref, i) {
@@ -49,6 +66,14 @@ function caml_atomic_fetch_add(ref, i) {
   return old;
 }
 
+//Provides: caml_atomic_fetch_add_field
+//Version: >= 5.4
+function caml_atomic_fetch_add_field(b, i, n) {
+  var old = b[i+1];
+  b[i + 1] += n;
+  return old;
+}
+
 //Provides: caml_atomic_exchange
 //Version: >= 5
 function caml_atomic_exchange(ref, v) {
@@ -57,6 +82,14 @@ function caml_atomic_exchange(ref, v) {
   return r;
 }
 
+//Provides: caml_atomic_exchange_field
+//Version: >= 5.4
+function caml_atomic_exchange_field(b, i, v) {
+  var r = b[i + 1];
+  b[i + 1] = v;
+  return r;
+}
+
 //Provides: caml_atomic_make_contended
 //Version: >= 5.2
 function caml_atomic_make_contended(a) {

runtime/js/io.js

@@ -194,6 +194,7 @@ function caml_ml_out_channels_list() {
 //Requires: caml_ml_channels, caml_sys_fds
 //Requires: caml_raise_sys_error
 //Requires: caml_sys_open
+//Requires: caml_io_buffer_size
 function caml_ml_open_descriptor_out(fd) {
   var fd_desc = caml_sys_fds[fd];
   if (fd_desc === undefined)
@@ -208,7 +209,7 @@ function caml_ml_open_descriptor_out(fd) {
     opened: true,
     out: true,
     buffer_curr: 0,
-    buffer: new Uint8Array(65536),
+    buffer: new Uint8Array(caml_io_buffer_size),
     buffered: buffered,
   };
   caml_ml_channels.set(chanid, channel);
@@ -219,6 +220,7 @@ function caml_ml_open_descriptor_out(fd) {
 //Requires: caml_ml_channels, caml_sys_fds
 //Requires: caml_raise_sys_error
 //Requires: caml_sys_open
+//Requires: caml_io_buffer_size
 function caml_ml_open_descriptor_in(fd) {
   var fd_desc = caml_sys_fds[fd];
   if (fd_desc === undefined)
@@ -234,7 +236,7 @@ function caml_ml_open_descriptor_in(fd) {
     out: false,
     buffer_curr: 0,
     buffer_max: 0,
-    buffer: new Uint8Array(65536),
+    buffer: new Uint8Array(caml_io_buffer_size),
     refill: refill,
   };
   caml_ml_channels.set(chanid, channel);

runtime/js/obj.js

@@ -38,6 +38,33 @@ function caml_alloc_dummy_infix() {
   };
 }
 
+//Provides: caml_alloc_dummy_lazy
+//Version: >= 5.4
+function caml_alloc_dummy_lazy(_unit) {
+  return [0, 0]
+}
+
+//Provides: caml_update_dummy_lazy
+//Requires: caml_obj_tag
+//Requires: caml_update_dummy
+//Version: >= 5.4
+function caml_update_dummy_lazy(dummy, newval){
+  switch(caml_obj_tag(newval)){
+  case 246: // Lazy
+  case 244: // Forcing
+  case 250: // Forward
+    caml_update_dummy(dummy, newval);
+    break;
+  default:
+    dummy[1] = newval;
+    dummy[0] = 250;
+    break;
+  }
+  return 0
+}
+
+
+
 //Provides: caml_obj_tag
 //Requires: caml_is_ml_bytes, caml_is_ml_string
 function caml_obj_tag(x) {

runtime/js/sys.js

@@ -133,6 +133,17 @@ function caml_sys_getenv(name) {
   return caml_string_of_jsstring(r);
 }
 
+//Provides: caml_sys_getenv_opt (const)
+//Requires: caml_string_of_jsstring
+//Requires: caml_jsstring_of_string
+//Requires: jsoo_sys_getenv
+//Version: >= 5.4
+function caml_sys_getenv_opt(name) {
+  var r = jsoo_sys_getenv(caml_jsstring_of_string(name));
+  if (r === undefined) return 0;
+  return [0, caml_string_of_jsstring(r)];
+}
+
 //Provides: caml_sys_unsafe_getenv
 //Requires: caml_sys_getenv
 function caml_sys_unsafe_getenv(name) {
@@ -350,6 +361,41 @@ function caml_sys_is_regular_file(name) {
   var root = resolve_fs_device(name);
   return root.device.isFile(root.rest);
 }
+
+//Provides: caml_io_buffer_size
+var caml_io_buffer_size = 65536
+
+//Provides: caml_sys_io_buffer_size
+//Requires: caml_io_buffer_size
+//Version: >= 5.4
+function caml_sys_io_buffer_size(_unit) { return caml_io_buffer_size; }
+
+//Provides: caml_sys_temp_dir_name
+//Requires: os_type
+//Requires: caml_string_of_jsstring
+//Version: >= 5.4
+function caml_sys_temp_dir_name(_unit) {
+  if(os_type === "Win32" && globalThis.os.tmpdir){
+    return caml_string_of_jsstring(globalThis.os.tmpdir())
+  }
+  else {
+    return caml_string_of_jsstring("")
+  }
+}
+
+//Provides: caml_sys_convert_signal_number
+//Version: >= 5.4
+function caml_sys_convert_signal_number(signo) {
+  return signo;
+}
+
+//Provides: caml_sys_rev_convert_signal_number
+//Version: >= 5.4
+function caml_sys_rev_convert_signal_number(signo)
+{
+  return signo
+}
+
 //Always
 //Requires: caml_fatal_uncaught_exception
 //If: !wasm

tools/toplevel_expect/gen.ml

@@ -53,5 +53,6 @@ let () =
       assert (min >= 11);
       dump_file "toplevel_expect_test.ml-4.11"
   | 5, 0 | 5, 1 | 5, 2 -> dump_file "toplevel_expect_test.ml-4.11"
-  | 5, _ -> dump_file "toplevel_expect_test.ml-5.3"
+  | 5, 3 -> dump_file "toplevel_expect_test.ml-5.3"
+  | 5, 4 -> dump_file "toplevel_expect_test.ml-5.4"
   | _ -> failwith ("unsupported version " ^ Sys.ocaml_version)