I booched a method on signature which was returning required + opt vs…

… just required
jruby · May 12, 2015 · d0132ad · d0132ad
1 parent 215521c
commit d0132ad
Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/Signature.java b/core/src/main/java/org/jruby/runtime/Signature.java
@@ -107,11 +107,11 @@ public static Signature from(Arity arity) {
             case 0:
                 return arity.isFixed() ? Signature.NO_ARGUMENTS : Signature.OPTIONAL;
             case 1:
-                return arity.isFixed() ? Signature.ONE_REQUIRED : Signature.ONE_ARGUMENT;
+                return arity.isFixed() ? Signature.ONE_ARGUMENT : Signature.ONE_REQUIRED;
             case 2:
-                return arity.isFixed() ? Signature.TWO_REQUIRED : Signature.TWO_ARGUMENTS;
+                return arity.isFixed() ? Signature.TWO_ARGUMENTS : Signature.TWO_REQUIRED;
             case 3:
-                return arity.isFixed() ? Signature.THREE_REQUIRED : Signature.THREE_ARGUMENTS;
+                return arity.isFixed() ? Signature.THREE_ARGUMENTS : Signature.THREE_REQUIRED;
         }
 
         throw new UnsupportedOperationException("We do not know enough about the arity to convert it to a signature");

diff --git a/test/mri/excludes/TestProc.rb b/test/mri/excludes/TestProc.rb
@@ -1,4 +1,3 @@
-exclude :test_arity2, "needs investigation"
 exclude :test_attr_source_location, "needs investigation"
 exclude :test_bound_parameters, "needs investigation"
 exclude :test_curry, "needs investigation"
@@ -15,4 +14,3 @@
 exclude :test_proc_args_pos_opt_post_block, "needs investigation"
 exclude :test_proc_lambda, "needs investigation"
 exclude :test_safe, "needs investigation"
-