Fix some cases for method#arity and proc#arity

rubinius · Feb 11, 2010 · b1f731d · b1f731d
1 parent 0b35b16
commit b1f731d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/kernel/common/block_environment.rb b/kernel/common/block_environment.rb
@@ -53,7 +53,7 @@ def call_on_instance(obj, *args)
     end
 
     def arity
-      if method.splat >= 0 or method.splat == -2
+      if method.splat and (method.splat >= 0 or method.splat == -2)
         -(method.required_args + 1)
       else
         method.required_args

diff --git a/lib/compiler/ast/sends.rb b/lib/compiler/ast/sends.rb
@@ -384,6 +384,7 @@ def initialize(line, arguments)
         array = []
         case arguments
         when Fixnum
+          @splat_index = nil
           @arity = 0
           @prelude = nil
         when MAsgn
@@ -402,10 +403,12 @@ def initialize(line, arguments)
               @arity = -1
             end
           elsif arguments.left
+            @splat_index = nil
             @prelude = :multi
             @arity = arguments.left.body.size
             @required_args = arguments.left.body.size
           else
+            @splat_index = 0
             @prelude = :multi
             @arity = -1
           end
@@ -423,6 +426,7 @@ def initialize(line, arguments)
           @prelude = nil
           @block = arguments
         else # Assignment
+          @splat_index = nil
           @arguments = arguments
           @arity = 1
           @required_args = 1