kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

prepend: fix ancestors order

Browse source 
* class.c (rb_mod_ancestors): fix ancestors order.
  [ruby-core:45919][Bug #6658] [ruby-dev:45861][Bug #6659]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-06-27 21:12:46 +00:00
parent c686986220
commit 3f3225905b
3 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jun 28 06:12:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* class.c (rb_mod_ancestors): fix ancestors order.
[ruby-core:45919][Bug #6658] [ruby-dev:45861][Bug #6659]
Wed Jun 27 21:28:59 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* lib/racc/parser.rb: NotImplementError is not exist.

15
class.c
View file

@ -838,11 +838,22 @@ VALUE
rb_mod_ancestors(VALUE mod)
{
VALUE p, ary = rb_ary_new();
VALUE origin = RCLASS_ORIGIN(mod);
for (p = mod; p; p = RCLASS_SUPER(p)) {
p = mod;
if (origin == mod) {
origin = 0;
}
else {
p = RCLASS_SUPER(p);
}
for (; p; p = RCLASS_SUPER(p)) {
if (FL_TEST(p, FL_SINGLETON))
continue;
if (BUILTIN_TYPE(p) == T_ICLASS) {
if (p == origin) {
rb_ary_push(ary, mod);
}
else if (BUILTIN_TYPE(p) == T_ICLASS) {
rb_ary_push(ary, RBASIC(p)->klass);
}
else {

34
test/ruby/test_module.rb
View file

@ -1273,9 +1273,9 @@ class TestModule < Test::Unit::TestCase
def test_prepend_inheritance
bug6654 = '[ruby-core:45914]'
a = Module.new
b = Module.new {include a}
c = Class.new {prepend b}
a = labeled_module("a")
b = labeled_module("b") {include a}
c = labeled_class("c") {prepend b}
assert_operator(c, :<, b, bug6654)
assert_operator(c, :<, a, bug6654)
end
@ -1299,4 +1299,32 @@ class TestModule < Test::Unit::TestCase
end
end
end
def test_prepend_class_ancestors
bug6658 = '[ruby-core:45919]'
m = labeled_module("m")
c = labeled_class("c") {prepend m}
assert_equal([m, c], c.ancestors[0, 2], bug6658)
end
def test_prepend_module_ancestors
bug6659 = '[ruby-dev:45861]'
m0 = labeled_module("m0")
m1 = labeled_module("m1") {prepend m0}
assert_equal([m0, m1], m1.ancestors, bug6659)
end
def labeled_module(name, &block)
Module.new do
singleton_class.class_eval {define_method(:to_s) {name}}
class_eval(&block) if block
end
end
def labeled_class(name, superclass = Object, &block)
Class.new(superclass) do
singleton_class.class_eval {define_method(:to_s) {name}}
class_eval(&block) if block
end
end
end