From 287facbf5429094fd49619d5504d0b33a32e3152 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Dec 2009 09:41:18 +0000
Subject: * lib/irb/extend-command.rb
 (IRB::ExtendCommandBundle::def_extend_command):   extension commands with
 optional parameters have been broken because of   a spec change of
 UnboundMethod#arity.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/irb/extend-command.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 84c4c05e1..862857466 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -126,8 +126,12 @@ module IRB
 	  def #{cmd_name}(*opts, &b)
 	    require "#{load_file}"
 	    arity = ExtendCommand::#{cmd_class}.instance_method(:execute).arity
-	    args = (1..arity).map {|i| "arg" + i.to_s }
-	    args << "*opts" if arity < 0
+            args = []
+	    if arity < 0
+	      args << "*opts"
+	      arity = -arity - 1
+	    end
+	    args.unshift *(1..arity).map {|i| "arg" + i.to_s }
 	    args << "&block"
 	    args = args.join(", ")
 	    eval <<-"EOS2", binding, __FILE__, __LINE__+1
-- 
cgit