* eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.

  fixed: [ruby-list:42928]

* test/ruby/test_super.rb: add tests to check above bug.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 32 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 76e857575b..42ed74bab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov  1 01:05:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.
+	  fixed: [ruby-list:42928]
+
+	* test/ruby/test_super.rb: add tests to check above bug.
+
 Tue Oct 31 17:03:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_dup): duplicate the class of original time.
diff --git a/eval.c b/eval.c
index f7924216af..17cd585333 100644
--- a/eval.c
+++ b/eval.c
@@ -5925,14 +5925,21 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 			while (opt && argc) {
 			    assign(recv, opt->nd_head, *argv, 1);
 			    argv++; argc--;
+			    ++i;
 			    opt = opt->nd_next;
 			}
 			if (opt) {
 			    rb_eval(recv, opt);
+			    while (opt) {
+				opt = opt->nd_next;
+				++i;
+			    }
 			}
+		    }
+		    if (!node->nd_rest) {
 			i = nopt;
 		    }
-		    if (node->nd_rest) {
+		    else {
 			VALUE v;
 			
 			if (argc > 0) {
diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb
index cf2e241fdd..900fe997e6 100644
--- a/test/ruby/test_super.rb
+++ b/test/ruby/test_super.rb
@@ -43,6 +43,12 @@ class TestSuper < Test::Unit::TestCase
   class Optional3 < Base
     def single(a = 1) super end
   end
+  class Optional4 < Base
+    def array(a = 1, *) super end
+  end
+  class Optional5 < Base
+    def array(a = 1, b = 2, *) super end
+  end
 
   def test_single1
     assert_equal(1, Single1.new.single(1))
@@ -94,6 +100,17 @@ class TestSuper < Test::Unit::TestCase
     # call Base#single with 1 argument; the arg is supplied
     assert_equal(1, Optional3.new.single)
   end
+  def test_optional4
+    assert_equal([1], Optional4.new.array)
+    assert_equal([9], Optional4.new.array(9))
+    assert_equal([9, 8], Optional4.new.array(9, 8))
+  end
+  def test_optional5
+    assert_equal([1, 2], Optional5.new.array)
+    assert_equal([9, 2], Optional5.new.array(9))
+    assert_equal([9, 8], Optional5.new.array(9, 8))
+    assert_equal([9, 8, 7], Optional5.new.array(9, 8, 7))
+  end
 
   class A
     def tt(aa)