Handle the case where f.length = 0

Author: vouillon

compiler/lib/generate.ml

@@ -923,8 +923,8 @@ let apply_fun_raw ctx f params exact cps =
       J.ECond
         ( J.EBin
             ( J.EqEq
-            , J.EBin
-                ( J.Or
+            , J.ECond
+                ( J.EBin (J.Ge, J.EDot (f, "l"), int 0)
                 , J.EDot (f, "l")
                 , J.EBin (J.Eq, J.EDot (f, "l"), J.EDot (f, "length")) )
             , int n )

runtime/stdlib.js

@@ -35,13 +35,15 @@ function caml_call_gen(f, args) {
     return caml_call_gen(f.apply(null,args.slice(0,n)),args.slice(n));
   }
   else {
-    return function (){
+    var g = function (){
       var extra_args = (arguments.length == 0)?1:arguments.length;
       var nargs = new Array(args.length+extra_args);
       for(var i = 0; i < args.length; i++ ) nargs[i] = args[i];
       for(var i = 0; i < arguments.length; i++ ) nargs[args.length+i] = arguments[i];
       return caml_call_gen(f, nargs)
-    }
+    };
+    g.l = d;
+    return g;
   }
 }
 
@@ -70,14 +72,16 @@ function caml_call_gen(f, args) {
   } else {
     argsLen--;
     var k = args [argsLen];
-    return k (function () {
+    var g = function (){
       var extra_args = (arguments.length == 0)?1:arguments.length;
       var nargs = new Array(argsLen + extra_args);
       for(var i = 0; i < argsLen; i++ ) nargs[i] = args[i];
       for(var i = 0; i < arguments.length; i++ )
         nargs[argsLen + i] = arguments[i];
       return caml_call_gen(f, nargs)
-    });
+    };
+    g.l = d;
+    return k(g);
   }
 }
 

runtime/stdlib_modern.js

@@ -33,13 +33,15 @@ function caml_call_gen(f, args) {
     return caml_call_gen(f(...args.slice(0,n)),args.slice(n));
   }
   else {
-    return function (){
+    var g = function (){
       var extra_args = (arguments.length == 0)?1:arguments.length;
       var nargs = new Array(args.length+extra_args);
       for(var i = 0; i < args.length; i++ ) nargs[i] = args[i];
       for(var i = 0; i < arguments.length; i++ ) nargs[args.length+i] = arguments[i];
       return caml_call_gen(f, nargs)
-    }
+    };
+    g.l = d;
+    return g;
   }
 }
 
@@ -68,13 +70,15 @@ function caml_call_gen(f, args) {
   } else {
     argsLen--;
     var k = args [argsLen];
-    return k (function () {
+    var g = function (){
       var extra_args = (arguments.length == 0)?1:arguments.length;
       var nargs = new Array(argsLen + extra_args);
       for(var i = 0; i < argsLen; i++ ) nargs[i] = args[i];
       for(var i = 0; i < arguments.length; i++ )
         nargs[argsLen + i] = arguments[i];
       return caml_call_gen(f, nargs)
-    });
+    };
+    g.l = d;
+    return k(g);
   }
 }