ruby-changes:14158
From: nobu <ko1@a...>
Date: Wed, 2 Dec 2009 17:33:06 +0900 (JST)
Subject: [ruby-changes:14158] Ruby:r25975 (ruby_1_8): * eval.c (proc_invoke): unbound block created by define_method
nobu 2009-12-02 17:32:52 +0900 (Wed, 02 Dec 2009) New Revision: 25975 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25975 Log: * eval.c (proc_invoke): unbound block created by define_method cannot call super. [ruby-core:26984] Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/eval.c branches/ruby_1_8/test/ruby/test_super.rb Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 25974) +++ ruby_1_8/ChangeLog (revision 25975) @@ -1,3 +1,8 @@ +Wed Dec 2 17:32:50 2009 Nobuyoshi Nakada <nobu@r...> + + * eval.c (proc_invoke): unbound block created by define_method + cannot call super. [ruby-core:26984] + Wed Dec 2 11:21:10 2009 NAKAMURA Usaku <usa@r...> * time.c (time_asctime): workaround for MSVCRT's bug. Index: ruby_1_8/test/ruby/test_super.rb =================================================================== --- ruby_1_8/test/ruby/test_super.rb (revision 25974) +++ ruby_1_8/test/ruby/test_super.rb (revision 25975) @@ -126,9 +126,27 @@ end end - def test_define_method # [ruby-core:03856] + class B + def m + [self, "#{self.class.to_s}::m"] + end + end + + class C < B + def self.t + define_method(:m) {super} + end + end + + def test_define_method a = A.new a.uu(12) - assert_equal("A#tt", a.tt(12)) + assert_equal("A#tt", a.tt(12), '[ruby-core:03856]') + + bug2419 = '[ruby-core:26984]' + q = C.t + assert_raise(NoMethodError, bug2419) {q.call} + c = C.new + assert_equal([c, "#{C.to_s}::m"], c.m, bug2419) end end Index: ruby_1_8/eval.c =================================================================== --- ruby_1_8/eval.c (revision 25974) +++ ruby_1_8/eval.c (revision 25975) @@ -8957,7 +8957,8 @@ _block = *data; _block.block_obj = bvar; if (self != Qundef) _block.frame.self = self; - if (klass) _block.frame.last_class = klass; + _block.frame.last_class = klass; + if (!klass) _block.frame.last_func = 0; _block.frame.argc = RARRAY(tmp)->len; _block.frame.flags = ruby_frame->flags; if (_block.frame.argc && DMETHOD_P()) { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/