Modernize stdlib

EMCASCRIPT.md

@@ -6,6 +6,8 @@ Features are grouped by ECMAScript version.
 ## ECMAScript 2015 - ES6
 ### rest parameters
 - added in Nodejs 6
+### spread in function call
+- added in Nodejs 5
 ### Object.assign
 - added In Nodejs 4
 ### ArrowFunction

compiler/lib-runtime-files/tests/all.ml

@@ -45,7 +45,6 @@ let%expect_test _ =
     +prng.js
     +runtime_events.js
     +stdlib.js
-    +stdlib_modern.js
     +str.js
     +sync.js
     +sys.js
@@ -98,5 +97,4 @@ let%expect_test _ =
   printl extra;
   [%expect {|
     +dynlink.js
-    +stdlib_modern.js
     +toplevel.js |}]

compiler/tests-compiler/gh1051.ml

@@ -22,7 +22,7 @@
 let prog = {|let () = Printf.printf "%nx" 0xffffffffn;;|}
 
 let%expect_test _ =
-  Util.compile_and_run ~skip_modern:true prog;
+  Util.compile_and_run prog;
   [%expect
     {|
     Warning: integer overflow: native integer 0xffffffff (4294967295) truncated to 0xffffffff (-1); the generated code might be incorrect.

compiler/tests-compiler/util/util.ml

@@ -566,23 +566,15 @@ let compile_and_run_bytecode ?unix s =
       |> run_bytecode
       |> print_endline)
 
-let compile_and_run
-    ?debug
-    ?pretty
-    ?(skip_modern = false)
-    ?(flags = [])
-    ?effects
-    ?use_js_string
-    ?unix
-    s =
+let compile_and_run ?debug ?pretty ?(flags = []) ?effects ?use_js_string ?unix s =
   with_temp_dir ~f:(fun () ->
       let bytecode_file =
         s
         |> Filetype.ocaml_text_of_string
         |> Filetype.write_ocaml ~name:"test.ml"
         |> compile_ocaml_to_bc ?debug ?unix
       in
-      let output_without_stdlib_modern =
+      let output =
         compile_bc_to_javascript
           ?pretty
           ~flags
@@ -592,24 +584,7 @@ let compile_and_run
           bytecode_file
         |> run_javascript
       in
-      print_endline output_without_stdlib_modern;
-      if not skip_modern
-      then
-        let output_with_stdlib_modern =
-          compile_bc_to_javascript
-            ~flags:(flags @ [ "+stdlib_modern.js" ])
-            ?effects
-            ?use_js_string
-            ?sourcemap:debug
-            bytecode_file
-          |> run_javascript
-        in
-        if not (String.equal output_without_stdlib_modern output_with_stdlib_modern)
-        then (
-          print_endline "Output was different with stdlib_modern.js:";
-          print_endline "===========================================";
-          print_string output_with_stdlib_modern;
-          print_endline "==========================================="))
+      print_endline output)
 
 let compile_and_parse_whole_program
     ?(debug = true)

compiler/tests-compiler/util/util.mli

@@ -81,7 +81,6 @@ val print_double_fun_decl : Javascript.program -> string -> unit
 val compile_and_run :
      ?debug:bool
   -> ?pretty:bool
-  -> ?skip_modern:bool
   -> ?flags:string list
   -> ?effects:[ `Disabled | `Cps | `Double_translation ]
   -> ?use_js_string:bool

runtime/js/stdlib.js

@@ -24,9 +24,9 @@ function caml_call_gen(f, args) {
   var n = f.l >= 0 ? f.l : (f.l = f.length);
   var argsLen = args.length;
   var d = n - argsLen;
-  if (d === 0) return f.apply(null, args);
+  if (d === 0) return f(...args);
   else if (d < 0) {
-    var g = f.apply(null, args.slice(0, n));
+    var g = f(...args.slice(0, n));
     if (typeof g !== "function") return g;
     return caml_call_gen(g, args.slice(n));
   } else {
@@ -36,7 +36,7 @@ function caml_call_gen(f, args) {
           var nargs = new Array(argsLen + 1);
           for (var i = 0; i < argsLen; i++) nargs[i] = args[i];
           nargs[argsLen] = x;
-          return f.apply(null, nargs);
+          return f(...nargs);
         };
         break;
       }
@@ -46,7 +46,7 @@ function caml_call_gen(f, args) {
           for (var i = 0; i < argsLen; i++) nargs[i] = args[i];
           nargs[argsLen] = x;
           nargs[argsLen + 1] = y;
-          return f.apply(null, nargs);
+          return f(...nargs);
         };
         break;
       }
@@ -70,8 +70,9 @@ function caml_call_gen(f, args) {
   var n = f.l >= 0 ? f.l : (f.l = f.length);
   var argsLen = args.length;
   var d = n - argsLen;
-  if (d === 0) return f.apply(null, args);
-  else if (d < 0) {
+  if (d === 0) {
+    return f(...args);
+  } else if (d < 0) {
     var rest = args.slice(n - 1);
     var k = args[argsLen - 1];
     args = args.slice(0, n);
@@ -81,7 +82,7 @@ function caml_call_gen(f, args) {
       args[args.length - 1] = k;
       return caml_call_gen(g, args);
     };
-    return f.apply(null, args);
+    return f(...args);
   } else {
     argsLen--;
     var k = args[argsLen];
@@ -92,7 +93,7 @@ function caml_call_gen(f, args) {
           for (var i = 0; i < argsLen; i++) nargs[i] = args[i];
           nargs[argsLen] = x;
           nargs[argsLen + 1] = y;
-          return f.apply(null, nargs);
+          return f(...nargs);
         };
         break;
       }
@@ -103,7 +104,7 @@ function caml_call_gen(f, args) {
           nargs[argsLen] = x;
           nargs[argsLen + 1] = y;
           nargs[argsLen + 2] = z;
-          return f.apply(null, nargs);
+          return f(...nargs);
         };
         break;
       }