CR

Author: hhugo

compiler/lib/generate.ml

@@ -1425,7 +1425,8 @@ let rec translate_expr ctx loc x e level : (_ * J.statement_list) Expr_builder.t
                 if String.starts_with name ~prefix:"%"
                 then failwith (Printf.sprintf "Unresolved internal primitive: %s" name);
                 match Linker.inline ~name with
-                | Some f -> (
+                | Some (req, f)
+                  when Option.is_none ctx.Ctx.exported_runtime || List.is_empty req -> (
                     let c = new Js_traverse.rename_variable ~esm:false in
                     let f = c#expression f in
                     match f with
@@ -1461,7 +1462,7 @@ let rec translate_expr ctx loc x e level : (_ * J.statement_list) Expr_builder.t
                         let r = new subst sub in
                         return (r#expression body)
                     | _ -> assert false)
-                | None ->
+                | None | Some _ ->
                     let prim = Share.get_prim (runtime_fun ctx) name ctx.Ctx.share in
                     let* () = info ~need_loc:true (kind (Primitive.kind name)) in
                     let* args = list_map (fun x -> access' ~ctx x) l in

compiler/lib/linker.ml

@@ -795,8 +795,8 @@ let inline ~name =
   | { id; inline; _ } ->
       if inline
       then
-        let code, _has_macro, _req, _deprecated = Hashtbl.find code_pieces id in
+        let code, _has_macro, req, _deprecated = Hashtbl.find code_pieces id in
         match unpack code with
-        | [ (Function_declaration (_, f), _) ] -> Some (Javascript.EFun (None, f))
+        | [ (Function_declaration (_, f), _) ] -> Some (req, Javascript.EFun (None, f))
         | _ -> None
       else None

compiler/lib/linker.mli

@@ -71,6 +71,6 @@ val missing : state -> string list
 
 val origin : name:string -> string option
 
-val inline : name:string -> Javascript.expression option
+val inline : name:string -> (string list * Javascript.expression) option
 
 val deprecated : name:string -> bool

compiler/tests-compiler/call_gen.ml

@@ -42,10 +42,11 @@ module M1 = struct
   let%expect_test "executed code" =
     compile_and_run code;
     [%expect {|
-    10
-    10
-    14
-    25 |}]
+      10
+      10
+      14
+      25
+      |}]
 
   let%expect_test "generated code" =
     let generated = compile_and_parse code in
@@ -148,5 +149,6 @@ module M2 = struct
       15
       20
       15
-      20 |}]
+      20
+      |}]
 end

compiler/tests-compiler/gh1559.ml

@@ -60,8 +60,8 @@ let () = my_ref := 2
 |}
   in
   Util.compile_and_run prog;
-  [%expect {|
-    1 |}];
+  [%expect
+    {| 1 |}];
   let program = Util.compile_and_parse prog in
   Util.print_program program;
   [%expect
@@ -165,8 +165,8 @@ let () = my_ref := 2
 |}
   in
   Util.compile_and_run prog;
-  [%expect {|
-    2 |}];
+  [%expect
+    {| 2 |}];
   let program = Util.compile_and_parse prog in
   Util.print_program program;
   [%expect

compiler/tests-compiler/unix_fs.ml

@@ -136,7 +136,8 @@ in
 f (); Sys.chdir "/static"; f () |};
   [%expect {|
     File size: 3
-    Failure("caml_unix_stat: not implemented")|}]
+    Failure("caml_unix_stat: not implemented")
+    |}]
 
 let%expect_test "Unix.stat_dir" =
   compile_and_run
@@ -180,7 +181,8 @@ f (); Sys.chdir "/static"; f () |};
     {|
     File size: 3
     Failure("caml_unix_symlink: not implemented")
-    Failure("caml_unix_stat: not implemented")|}]
+    Failure("caml_unix_stat: not implemented")
+    |}]
 
 let%expect_test "Unix.symlink_Unix.readlink" =
   compile_and_run
@@ -247,7 +249,8 @@ in
 f (); Sys.chdir "/static"; f () |};
   [%expect {|
     File size: 3
-    Failure("caml_unix_lstat: not implemented")|}]
+    Failure("caml_unix_lstat: not implemented")
+    |}]
 
 let%expect_test "Unix.lstat_symlink" =
   compile_and_run

compiler/tests-full/stdlib.cma.expected.js

@@ -746,7 +746,8 @@
      /*<<stdlib.ml:488:20>>*/ return output_bytes(stdout, s) /*<<stdlib.ml:488:41>>*/ ;
    }
    function print_int(i){
-     /*<<stdlib.ml:489:56>>*/ return output_string(stdout, "" + i);
+     /*<<stdlib.ml:266:2>>*/ return  /*<<stdlib.ml:489:56>>*/ output_string
+            (stdout,  /*<<stdlib.ml:266:2>>*/ caml_format_int_special(i)) /*<<stdlib.ml:489:56>>*/ ;
    }
    function print_float(f){
      /*<<stdlib.ml:490:41>>*/ return  /*<<stdlib.ml:490:60>>*/ output_string
@@ -771,7 +772,8 @@
      /*<<stdlib.ml:499:20>>*/ return output_bytes(stderr, s) /*<<stdlib.ml:499:41>>*/ ;
    }
    function prerr_int(i){
-     /*<<stdlib.ml:500:56>>*/ return output_string(stderr, "" + i);
+     /*<<stdlib.ml:266:2>>*/ return  /*<<stdlib.ml:500:56>>*/ output_string
+            (stderr,  /*<<stdlib.ml:266:2>>*/ caml_format_int_special(i)) /*<<stdlib.ml:500:56>>*/ ;
    }
    function prerr_float(f){
      /*<<stdlib.ml:501:41>>*/ return  /*<<stdlib.ml:501:60>>*/ output_string

compiler/tests-jsoo/test_unix.ml

@@ -149,7 +149,7 @@ let%expect_test "Unix.read" =
   [%expect {|
     write failed
     bad file descriptor
- |}]
+    |}]
 
 let%expect_test "Unix.getenv" =
   Printf.printf "%s\n" (Sys.getenv "FOO");

runtime/js/format.js

@@ -143,7 +143,8 @@ function caml_finish_formatting(f, rawbuffer) {
 
 //Provides: caml_format_int_special const
 //Alias: %caml_format_int_special
+//Requires: caml_string_of_jsstring
 //Inline
 function caml_format_int_special(x) {
-  return "" + x;
+  return caml_string_of_jsstring ("" + x);
 }