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

class.c: exclude original module

Browse source 
* class.c (rb_mod_included_modules): should not include the original
  module itself.  [ruby-core:53158] [Bug #8025]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-05-08 13:47:11 +00:00
parent 6359460610
commit 3fd0000c0c
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed May 8 22:46:59 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* class.c (rb_mod_included_modules): should not include the original
module itself. [ruby-core:53158] [Bug #8025]
Wed May 8 17:43:55 2013 NARUSE, Yui <naruse@ruby-lang.org> Wed May 8 17:43:55 2013 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_io_ext_int_to_encs): ignore internal encoding if external * io.c (rb_io_ext_int_to_encs): ignore internal encoding if external

3
class.c
View file

@ -851,9 +851,10 @@ rb_mod_included_modules(VALUE mod)
{ {
VALUE ary = rb_ary_new(); VALUE ary = rb_ary_new();
VALUE p; VALUE p;
VALUE origin = RCLASS_ORIGIN(mod);
for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) { for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
if (BUILTIN_TYPE(p) == T_ICLASS) { if (p != origin && BUILTIN_TYPE(p) == T_ICLASS) {
rb_ary_push(ary, RBASIC(p)->klass); rb_ary_push(ary, RBASIC(p)->klass);
} }
} }

7
test/ruby/test_module.rb
View file

@ -1548,6 +1548,13 @@ class TestModule < Test::Unit::TestCase
assert_nothing_raised(NoMethodError, bug8005) {a.send :foo} assert_nothing_raised(NoMethodError, bug8005) {a.send :foo}
end end
def test_prepend_included_modules
bug8025 = '[ruby-core:53158] [Bug #8025]'
mixin = labeled_module("mixin")
c = labeled_module("c") {prepend mixin}
assert_not_include(c.included_modules, c, bug8025)
end
def test_class_variables def test_class_variables
m = Module.new m = Module.new
m.class_variable_set(:@@foo, 1) m.class_variable_set(:@@foo, 1)