Skip to content

Commit c1ae613

Browse files
committed
Default use_js_string to false
This is not supported by Oxcaml at the moment
1 parent d901a11 commit c1ae613

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

compiler/bin-js_of_ocaml/check_runtime.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ let print_groups output l =
4343
output_string output (Printf.sprintf "%s\n" name)))
4444

4545
let f (runtime_files, bytecode, target_env) =
46+
Config.Flag.set "use-js-string" true;
4647
Config.set_target `JavaScript;
4748
Config.set_effects_backend `Disabled;
4849
Linker.reset ();

compiler/lib/config.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ module Flag = struct
9393

9494
let safe_string = o ~name:"safestring" ~default:true
9595

96-
let use_js_string = o ~name:"use-js-string" ~default:true
96+
let use_js_string = o ~name:"use-js-string" ~default:false
9797

9898
let check_magic = o ~name:"check-magic-number" ~default:true
9999

compiler/tests-full/dune

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
var
1313
--debuginfo
1414
%{lib:stdlib:stdlib.cma}
15+
--enable
16+
use-js-string
1517
-o
1618
%{targets})))
1719

@@ -53,6 +55,8 @@
5355
--pretty
5456
--debuginfo
5557
%{dep:shapes.cma}
58+
--enable
59+
use-js-string
5660
-o
5761
%{targets})))
5862

lib/tests/test_fun_call.ml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,7 @@ let%expect_test _ =
422422
let f = Js.wrap_callback (fun s -> print_endline s) in
423423
Js.export "f" f;
424424
let () =
425-
Js.Unsafe.fun_call
426-
(Js.Unsafe.pure_js_expr "jsoo_exports")##.f
427-
[| Js.Unsafe.coerce (Js.string "hello") |]
425+
Js.Unsafe.fun_call (Js.Unsafe.pure_js_expr "jsoo_exports")##.f [| Obj.magic "hello" |]
428426
in
429427
();
430428
[%expect {| hello |}]

0 commit comments

Comments
 (0)