[Truffle] Last of the def-2.0 specs.

jruby · Dec 12, 2014 · 2df1533 · 2df1533
1 parent 8ddeaaf
commit 2df1533
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/methods/arguments/CheckArityNode.java b/core/src/main/java/org/jruby/truffle/nodes/methods/arguments/CheckArityNode.java
@@ -44,7 +44,7 @@ public CheckArityNode(RubyContext context, SourceSection sourceSection, Arity ar
     public void executeVoid(VirtualFrame frame) {
         final int given = RubyArguments.getUserArgumentsCount(frame.getArguments());
 
-        if (!checkArity(given)) {
+        if (!checkArity(frame, given)) {
             CompilerDirectives.transferToInterpreter();
             throw new RaiseException(getContext().getCoreLibrary().argumentError(given, arity.getRequired(), this));
         }
@@ -60,17 +60,17 @@ public void executeVoid(VirtualFrame frame) {
         }
     }
 
-    private boolean checkArity(int given) {
-        if (arity.hasKeywords()) {
-            return true;
+    private boolean checkArity(VirtualFrame frame, int given) {
+        if (arity.hasKeywords() && getKeywordsHash(frame) != null) {
+            given -= 1;
+        }
+
+        if (arity.getRequired() != 0 && given < arity.getRequired()) {
+            return false;
+        } else if (!arity.allowsMore() && given > arity.getRequired() + arity.getOptional()) {
+            return false;
         } else {
-            if (arity.getRequired() != 0 && given < arity.getRequired()) {
-                return false;
-            } else if (!arity.allowsMore() && given > arity.getRequired() + arity.getOptional()) {
-                return false;
-            } else {
-                return true;
-            }
+            return true;
         }
     }
 

diff --git a/spec/truffle/tags/language/versions/def_2.0_tags.txt b/spec/truffle/tags/language/versions/def_2.0_tags.txt