Revert "Revert "Fixed arity issue with RubyMethod""

jruby · Feb 12, 2015 · bd057e9 · bd057e9
1 parent 634af39
commit bd057e9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ast/ArgsNode.java b/core/src/main/java/org/jruby/ast/ArgsNode.java
@@ -283,4 +283,27 @@ public List<Node> childNodes() {
 
         return Node.createList(pre, optArgs, restArgNode, blockArgNode);
     }
+
+    public int getRequiredKeywordCount() {
+        if (hasRequiredKeywordArg()) return 1;
+        return 0;
+    }
+
+    private boolean hasRequiredKeywordArg() {
+        if (getKeywords() == null) return false;
+
+        for (Node keyWordNode :getKeywords().childNodes()) {
+            for (Node asgnNode : keyWordNode.childNodes()) {
+                if (isRequiredKeywordArgumentValueNode(asgnNode)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean isRequiredKeywordArgumentValueNode(Node asgnNode) {
+        return asgnNode.childNodes().get(0) instanceof RequiredKeywordArgumentValueNode;
+    }
+
 }
diff --git a/core/src/main/java/org/jruby/ast/MethodDefNode.java b/core/src/main/java/org/jruby/ast/MethodDefNode.java
@@ -53,9 +53,10 @@ public MethodDefNode(ISourcePosition position, ArgumentNode nameNode, ArgsNode a
             this.bodyNode = bodyNode;
 
             // store argument count information into scope
-            scope.setArities(argsNode.getRequiredArgsCount(), argsNode.getOptionalArgsCount(), argsNode.getRestArg());
+            scope.setArities(argsNode.getRequiredArgsCount() + argsNode.getRequiredKeywordCount(), argsNode.getOptionalArgsCount(), argsNode.getRestArg());
 	}
 
+
 	/**
 	 * Gets the argsNode.
 	 * @return Returns a Node

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -1754,7 +1754,7 @@ public void receiveRequiredArg(Node node, int argIndex, boolean post, int numPre
     protected void receiveNonBlockArgs(final ArgsNode argsNode) {
         final int numPreReqd = argsNode.getPreCount();
         final int numPostReqd = argsNode.getPostCount();
-        final int required = argsNode.getRequiredArgsCount(); // numPreReqd + numPostReqd
+        final int required = argsNode.getRequiredArgsCount() + argsNode.getRequiredKeywordCount(); // numPreReqd + numPostReqd
         int opt = argsNode.getOptionalArgsCount();
         int rest = argsNode.getRestArg();