Commit 468cc34c authored by Christopher Aue's avatar Christopher Aue

Fixed Module#to_s and #name for #const_set modules

parent 52aafcd0
assert 'Module#name' do
module A
class B
module Outer
class Inner; end
const_set :SetInner, Class.new
end
assert_equal 'Outer', Outer.name
assert_equal 'Outer::Inner', Outer::Inner.name
assert_equal 'Outer::SetInner', Outer::SetInner.name
outer = Module.new do
const_set :SetInner, Class.new
end
Object.const_set :SetOuter, outer
assert_equal 'SetOuter', SetOuter.name
assert_equal 'SetOuter::SetInner', SetOuter::SetInner.name
mod = Module.new
cls = Class.new
assert_nil A::B.singleton_class.name
assert_equal 'Fixnum', Fixnum.name
assert_equal 'A::B', A::B.name
assert_nil mod.name
assert_nil cls.name
end
......@@ -2178,6 +2178,9 @@ mrb_mod_const_set(mrb_state *mrb, mrb_value mod)
mrb_get_args(mrb, "no", &id, &value);
check_const_name_sym(mrb, id);
if (mrb_type(value) == MRB_TT_CLASS || mrb_type(value) == MRB_TT_MODULE) {
setup_class(mrb, mrb_class_ptr(mod), mrb_class_ptr(value), id);
}
mrb_const_set(mrb, mod, id, value);
return value;
}
......
......@@ -787,10 +787,28 @@ end
# @!endgroup prepend
assert('Module#to_s') do
module Test4to_sModules
module Outer
class Inner; end
const_set :SetInner, Class.new
end
assert_equal 'Outer', Outer.to_s
assert_equal 'Outer::Inner', Outer::Inner.to_s
assert_equal 'Outer::SetInner', Outer::SetInner.to_s
outer = Module.new do
const_set :SetInner, Class.new
end
Object.const_set :SetOuter, outer
assert_equal 'SetOuter', SetOuter.to_s
assert_equal 'SetOuter::SetInner', SetOuter::SetInner.to_s
mod = Module.new
cls = Class.new
assert_equal 'Test4to_sModules', Test4to_sModules.to_s
assert_equal "#<Module:0x", mod.to_s[0,11]
assert_equal "#<Class:0x", cls.to_s[0,10]
end
assert('Module#inspect') do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment