Tweaks to prepare args to deal with lambda/proc combinations

* This should be better .. but let us see what Travis thinks.
jruby · Dec 18, 2015 · 3a0d0b7 · 3a0d0b7
1 parent aeea008
commit 3a0d0b7
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1516,14 +1516,14 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo
         }
 
         boolean isLambda = block.type == Block.Type.LAMBDA;
-        if (isLambda) {
-            block.getBody().getSignature().checkArity(context.runtime, args);
-            return args;
-        }
-
         boolean isProcCall = context.getCurrentBlockType() == Block.Type.PROC;
         if (isProcCall) {
-            return prepareProcArgs(context, block, args);
+            if (isLambda) {
+                block.getBody().getSignature().checkArity(context.runtime, args);
+                return args;
+            } else {
+                return prepareProcArgs(context, block, args);
+            }
         }
 
         BlockBody body = block.getBody();
@@ -1533,6 +1533,7 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo
         // This test is when we only have opt / rest arg (either keyword or non-keyword)
         // but zero required args.
         if (sig.arityValue() == -1) {
+            if (isLambda) block.getBody().getSignature().checkArity(context.runtime, args);
             return args;
         }
 
@@ -1543,6 +1544,7 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo
 
         // Nothing more to do for lambdas
         if (isLambda) {
+            block.getBody().getSignature().checkArity(context.runtime, args);
             return args;
         }
 
@@ -1569,8 +1571,6 @@ private static IRubyObject[] prepareBlockArgsInternal(ThreadContext context, Blo
             args = newArgs;
         }
 
-        if (block.type == Block.Type.LAMBDA) block.getBody().getSignature().checkArity(context.runtime, args);
-
         return args;
     }
 
@@ -1608,9 +1608,15 @@ public static IRubyObject[] prepareFixedBlockArgs(ThreadContext context, Block b
             return IRubyObject.NULL_ARRAY;
         }
 
+        boolean isLambda = block.type == Block.Type.LAMBDA;
         boolean isProcCall = context.getCurrentBlockType() == Block.Type.PROC;
         if (isProcCall) {
-            return IRRuntimeHelpers.prepareProcArgs(context, block, args);
+            if (isLambda) {
+                block.getBody().getSignature().checkArity(context.runtime, args);
+                return args;
+            } else {
+                return prepareProcArgs(context, block, args);
+            }
         }
 
         // SSS FIXME: This check here is not required as long as
@@ -1624,7 +1630,7 @@ public static IRubyObject[] prepareFixedBlockArgs(ThreadContext context, Block b
         // convert a single value to an array if possible.
         args = IRRuntimeHelpers.toAry(context, args);
 
-        if (block.type == Block.Type.LAMBDA) block.getBody().getSignature().checkArity(context.runtime, args);
+        if (isLambda) block.getBody().getSignature().checkArity(context.runtime, args);
 
         // If there are insufficient args, ReceivePreReqdInstr will return nil
         return args;
@@ -1636,10 +1642,8 @@ public static IRubyObject[] prepareSingleBlockArgs(ThreadContext context, Block
 
         if (block.type == Block.Type.LAMBDA) {
             block.getBody().getSignature().checkArity(context.runtime, args);
-        }
-
-        // Deal with proc calls
-        if (context.getCurrentBlockType() == Block.Type.PROC) {
+        } else if (context.getCurrentBlockType() == Block.Type.PROC) {
+            // Deal with proc calls
             if (args.length == 0) {
                 args = context.runtime.getSingleNilArray();
             } else if (args.length == 1) {
@@ -1649,6 +1653,7 @@ public static IRubyObject[] prepareSingleBlockArgs(ThreadContext context, Block
             }
         }
 
+
         // Nothing more to do! Hurray!
         // If there are insufficient args, ReceivePreReqdInstr will return nil
         return args;