rename

hhugo · hhugo · commit bd2f1777d849 · 2025-11-03T12:59:38.000+01:00
diff --git a/compiler/lib-wasm/gc_target.ml b/compiler/lib-wasm/gc_target.ml
@@ -1932,7 +1932,7 @@ let internal_primitives =
       in
       let l = List.map ~f:transl_prim_arg vl in
       JavaScript.invoke_fragment name l);
-  register "caml_jsoo_runtime" (fun _ l ->
+  register "caml_jsoo_runtime_value" (fun _ l ->
       match l with
       | [ Pc (String name) ] when J.is_ident name ->
           let* x =
@@ -1947,7 +1947,7 @@ let internal_primitives =
               (Fun { params = [ JavaScript.anyref ]; result = [ Type.value ] })
           in
           return (W.Call (wrap, [ GlobalGet x ]))
-      | _ -> failwith "Jsoo_runtime.Sys.external_ expects a string literal.");
+      | _ -> failwith "Jsoo_runtime.Js.runtime_value expects a string literal.");
   !l
 
 let externref = W.Ref { nullable = true; typ = Extern }
diff --git a/compiler/lib/generate.ml b/compiler/lib/generate.ml
@@ -1547,13 +1547,13 @@ let rec translate_expr ctx loc x e level : (_ * J.statement_list) Expr_builder.t
                    | Some s -> Printf.sprintf ", file %S" s)
                    pi.Parse_info.line
                    pi.Parse_info.col))
-        | Extern "caml_jsoo_runtime", [ Pc (String nm) ] when J.is_ident nm ->
+        | Extern "caml_jsoo_runtime_value", [ Pc (String nm) ] when J.is_ident nm ->
             let prim = Share.get_prim (runtime_fun ctx) nm ctx.Ctx.share in
             return prim
-        | Extern "caml_jsoo_runtime", [ (Pc _ | Pv _) ] ->
+        | Extern "caml_jsoo_runtime_value", [ (Pc _ | Pv _) ] ->
             failwith
               (Printf.sprintf
-                 "%scaml_jsoo_runtime expects a string literal."
+                 "%sJsoo_runtime.Js.runtime_value expects a string literal."
                  (match (loc : J.location) with
                  | Pi { name = Some name; col; line; _ } ->
                      Printf.sprintf "%s:%d:%d: " name line col
diff --git a/compiler/lib/specialize_js.ml b/compiler/lib/specialize_js.ml
@@ -188,10 +188,10 @@ let specialize_instr opt_count ~target info i =
           incr opt_count;
           Let (x, Prim (Extern "%direct_int_mod", [ y; z ]))
       | _ -> i)
-  | Let (x, Prim (Extern "caml_jsoo_runtime", [ nm ])), _ -> (
+  | Let (x, Prim (Extern "caml_jsoo_runtime_value", [ nm ])), _ -> (
       match the_string_of info nm with
       | Some nm when Javascript.is_ident nm ->
-          Let (x, Prim (Extern "caml_jsoo_runtime", [ Pc (String nm) ]))
+          Let (x, Prim (Extern "caml_jsoo_runtime_value", [ Pc (String nm) ]))
       | _ -> i)
   | _, _ -> i
 
diff --git a/compiler/tests-check-prim/main.4.14.output b/compiler/tests-check-prim/main.4.14.output
@@ -14,7 +14,7 @@ caml_int64_or_native
 caml_int64_sub_native
 caml_int64_xor_native
 caml_int_as_pointer
-caml_jsoo_runtime
+caml_jsoo_runtime_value
 caml_reset_afl_instrumentation
 debugger
 
diff --git a/compiler/tests-check-prim/main.5.4.output b/compiler/tests-check-prim/main.5.4.output
@@ -5,7 +5,7 @@ From main.bc:
 caml_assume_no_perform
 caml_continuation_use
 caml_int_as_pointer
-caml_jsoo_runtime
+caml_jsoo_runtime_value
 caml_reset_afl_instrumentation
 debugger
 
diff --git a/compiler/tests-check-prim/unix-Unix.4.14.output b/compiler/tests-check-prim/unix-Unix.4.14.output
@@ -14,7 +14,7 @@ caml_int64_or_native
 caml_int64_sub_native
 caml_int64_xor_native
 caml_int_as_pointer
-caml_jsoo_runtime
+caml_jsoo_runtime_value
 caml_reset_afl_instrumentation
 caml_unix_map_file_bytecode
 debugger
diff --git a/compiler/tests-check-prim/unix-Unix.5.4.output b/compiler/tests-check-prim/unix-Unix.5.4.output
@@ -5,7 +5,7 @@ From unix.bc:
 caml_assume_no_perform
 caml_continuation_use
 caml_int_as_pointer
-caml_jsoo_runtime
+caml_jsoo_runtime_value
 caml_reset_afl_instrumentation
 caml_unix_accept
 caml_unix_alarm
diff --git a/compiler/tests-check-prim/unix-Win32.4.14.output b/compiler/tests-check-prim/unix-Win32.4.14.output
@@ -14,7 +14,7 @@ caml_int64_or_native
 caml_int64_sub_native
 caml_int64_xor_native
 caml_int_as_pointer
-caml_jsoo_runtime
+caml_jsoo_runtime_value
 caml_reset_afl_instrumentation
 caml_unix_map_file_bytecode
 debugger
diff --git a/compiler/tests-check-prim/unix-Win32.5.4.output b/compiler/tests-check-prim/unix-Win32.5.4.output
@@ -5,7 +5,7 @@ From unix.bc:
 caml_assume_no_perform
 caml_continuation_use
 caml_int_as_pointer
-caml_jsoo_runtime
+caml_jsoo_runtime_value
 caml_reset_afl_instrumentation
 caml_unix_accept
 caml_unix_bind
diff --git a/compiler/tests-jsoo/test_custom.ml b/compiler/tests-jsoo/test_custom.ml
@@ -1,8 +1,8 @@
 open Js_of_ocaml
 
 let () =
-  let p : Js.js_string Js.t = Jsoo_runtime.Sys.external_ "process" in
-  let o : _ Js.t = Jsoo_runtime.Sys.external_ "obj" in
-  let del = Jsoo_runtime.Sys.external_ "caml_js_delete" in
+  let p : Js.js_string Js.t = Jsoo_runtime.Js.runtime_value "process" in
+  let o : _ Js.t = Jsoo_runtime.Js.runtime_value "obj" in
+  let del = Jsoo_runtime.Js.runtime_value "caml_js_delete" in
   ignore (Js.Unsafe.fun_call del [| o; Js.Unsafe.coerce (Js.string "process") |]);
   print_endline (Js.to_string p)
diff --git a/lib/runtime/js_of_ocaml_runtime_stubs.c b/lib/runtime/js_of_ocaml_runtime_stubs.c
@@ -208,8 +208,8 @@ void caml_jsoo_flags_use_js_string () {
   caml_fatal_error("Unimplemented Javascript primitive caml_jsoo_flags_use_js_string!");
 }
 
-void caml_jsoo_runtime () {
-  caml_fatal_error("Unimplemented Javascript primitive caml_jsoo_runtime!");
+void caml_jsoo_runtime_value () {
+  caml_fatal_error("Unimplemented Javascript primitive caml_jsoo_runtime_value!");
 }
 
 void caml_jsstring_of_string () {
diff --git a/lib/runtime/jsoo_runtime.ml b/lib/runtime/jsoo_runtime.ml
@@ -94,6 +94,8 @@ module Js = struct
 
   external wrap_meth_callback : ('a -> 'b) -> ('a, 'b) meth_callback
     = "caml_js_wrap_meth_callback"
+
+  external runtime_value : string -> 'a = "caml_jsoo_runtime_value"
 end
 
 module Sys = struct
@@ -124,8 +126,6 @@ module Sys = struct
   external restore_channel : out_channel -> redirection -> unit
     = "caml_ml_channel_restore"
 
-  external external_ : string -> 'a = "caml_jsoo_runtime"
-
   module Config = struct
     external use_js_string : unit -> bool = "caml_jsoo_flags_use_js_string"
 
