Merge branch 'christopheraue-const_set_mod_to_s'

3 files changed, 48 insertions, 9 deletions

diff --git a/mrbgems/mruby-class-ext/test/module.rb b/mrbgems/mruby-class-ext/test/module.rb
index f721ad0c6..cfe6a540f 100644
--- a/mrbgems/mruby-class-ext/test/module.rb
+++ b/mrbgems/mruby-class-ext/test/module.rb
@@ -1,10 +1,24 @@
 assert 'Module#name' do
-  module A
-    class B
-    end
+  module Outer
+    class Inner; end
+    const_set :SetInner, Class.new
   end
 
-  assert_nil A::B.singleton_class.name
-  assert_equal 'Fixnum', Fixnum.name
-  assert_equal 'A::B', A::B.name
+  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 mod.name
+  assert_nil cls.name
 end
diff --git a/src/class.c b/src/class.c
index e4e177f04..41a0fbad8 100644
--- a/src/class.c
+++ b/src/class.c
@@ -2178,7 +2178,14 @@ mrb_mod_const_set(mrb_state *mrb, mrb_value mod)
 
   mrb_get_args(mrb, "no", &id, &value);
   check_const_name_sym(mrb, id);
-  mrb_const_set(mrb, mod, id, value);
+  if ((mrb_type(value) == MRB_TT_CLASS || mrb_type(value) == MRB_TT_MODULE)
+      && !mrb_obj_iv_defined(mrb, mrb_obj_ptr(value), mrb_intern_lit(mrb, "__classid__"))) {
+    /* name unnamed classes/modules */
+    setup_class(mrb, mrb_class_ptr(mod), mrb_class_ptr(value), id);
+  }
+  else {
+    mrb_const_set(mrb, mod, id, value);
+  }
   return value;
 }
 
diff --git a/test/t/module.rb b/test/t/module.rb
index cfdca8503..419b0bfd5 100644
--- a/test/t/module.rb
+++ b/test/t/module.rb
@@ -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