diff options
-rw-r--r-- | ChangeLog | 15 | ||||
-rw-r--r-- | proc.c | 13 | ||||
-rw-r--r-- | test/ruby/test_super.rb | 33 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 59 insertions, 8 deletions
@@ -1,3 +1,18 @@ +Tue Jan 7 01:16:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * proc.c (mnew_from_me): keep iclass as-is, to make inheritance + chain consistent. [ruby-core:59358] [Bug #9315] + + * proc.c (method_owner): return the original defined_class from + prepended iclass, instead. + +Tue Jan 7 01:16:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_insnhelper.c (vm_search_super_method): direct superclass of a + module is found when super called in a Method object generated a + method defined in a module, call method_missing in that case. + [ruby-core:59358] [Bug #9315] + Fri Jan 3 22:25:23 2014 Aman Gupta <ruby@tmm1.net> * test/net/imap/cacert.pem: generate new CA cert, since the last one @@ -992,10 +992,6 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope) goto again; } - if (RB_TYPE_P(defined_class, T_ICLASS)) { - defined_class = RBASIC(defined_class)->klass; - } - klass = defined_class; while (rclass != klass && @@ -1173,9 +1169,16 @@ static VALUE method_owner(VALUE obj) { struct METHOD *data; + VALUE defined_class; TypedData_Get_Struct(obj, struct METHOD, &method_data_type, data); - return data->defined_class; + defined_class = data->defined_class; + + if (RB_TYPE_P(defined_class, T_ICLASS)) { + defined_class = RBASIC(defined_class)->klass; + } + + return defined_class; } void diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb index 1aab553ebb..a7a3840d50 100644 --- a/test/ruby/test_super.rb +++ b/test/ruby/test_super.rb @@ -408,4 +408,37 @@ class TestSuper < Test::Unit::TestCase assert_equal([false, false], y.foo(false, false)) assert_equal([1, 2, 3, false, 5], y.foo(1, 2, 3, false, 5)) end + + def test_missing_super_in_method_module + bug9315 = '[ruby-core:59358] [Bug #9315]' + a = Module.new do + def foo + super + end + end + b = Class.new do + include a + end + assert_raise(NoMethodError, bug9315) do + b.new.method(:foo).call + end + end + + def test_module_super_in_method_module + bug9315 = '[ruby-core:59589] [Bug #9315]' + a = Module.new do + def foo + super + end + end + c = Class.new do + def foo + :ok + end + end + o = c.new.extend(a) + assert_nothing_raised(NoMethodError, bug9315) do + assert_equal(:ok, o.method(:foo).call, bug9315) + end + end end @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-01-03" -#define RUBY_PATCHLEVEL 377 +#define RUBY_RELEASE_DATE "2014-01-07" +#define RUBY_PATCHLEVEL 378 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" |