Polish the stone...get rid of some extra processing of parameters for…

… opt/rest side of Proc#curry
jruby · Feb 14, 2017 · 679bb6e · 679bb6e
1 parent f7d1444
commit 679bb6e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/core/src/main/ruby/jruby/kernel/proc.rb b/core/src/main/ruby/jruby/kernel/proc.rb
@@ -9,9 +9,16 @@ def curry(curried_arity = nil)
       end
 
       if arity < -1
-        is_rest = parameters.find {|(type, _)| type == :rest }
+        is_rest, opt = false, 0
+        parameters.each do |arr|
+          case arr[0]
+          when :rest then
+            is_rest = true
+          when :opt then
+            opt += 1
+          end
+        end
         req = -arity - 1
-        opt = parameters.find_all {|(type, _)| type == :opt }.size
         if curried_arity < req || curried_arity > (req + opt) && !is_rest
           expected = is_rest ?  "#{req}+" : "#{req}..#{req+opt}"
           raise ArgumentError, "wrong number of arguments (given %i, expected %s)" % [