* insns.def (defineclass): preserve encoding of class/module

  names.  [ruby-core:24600]

* variable.c (rb_set_class_path_string): set class path with a
  string value.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 43 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e3b958ebc8..46332d3aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 30 16:45:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass): preserve encoding of class/module
+	  names.  [ruby-core:24600]
+
+	* variable.c (rb_set_class_path_string): set class path with a
+	  string value.
+
 Thu Jul 30 16:12:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* variable.c (Init_var_tables): initializes __classid__ ID.
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index bfbd0ef165..8e6e152827 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -759,6 +759,7 @@ VALUE rb_time_num_new(VALUE, VALUE);
 VALUE rb_mod_name(VALUE);
 VALUE rb_class_path(VALUE);
 void rb_set_class_path(VALUE, VALUE, const char*);
+void rb_set_class_path_string(VALUE, VALUE, VALUE);
 VALUE rb_path2class(const char*);
 void rb_name_class(VALUE, ID);
 VALUE rb_class_name(VALUE);
diff --git a/insns.def b/insns.def
index 724f086dce..98f0dcd14c 100644
--- a/insns.def
+++ b/insns.def
@@ -909,7 +909,7 @@ defineclass
 	else {
 	    /* new class declaration */
 	    klass = rb_define_class_id(id, super);
-	    rb_set_class_path(klass, cbase, rb_id2name(id));
+	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
 	    rb_const_set(cbase, id, klass);
 	    rb_class_inherited(super, klass);
 	}
@@ -936,7 +936,7 @@ defineclass
 	else {
 	    /* new module declaration */
 	    klass = rb_define_module_id(id);
-	    rb_set_class_path(klass, cbase, rb_id2name(id));
+	    rb_set_class_path_string(klass, cbase, rb_id2str(id));
 	    rb_const_set(cbase, id, klass);
 	}
 	break;
diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index 93a19e86e9..bc0f79a681 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -144,4 +144,11 @@ class TestClass < Test::Unit::TestCase
     assert_raise(TypeError) { Class.allocate.new }
     assert_raise(TypeError) { Class.allocate.superclass }
   end
+
+  def test_nonascii_name
+    c = eval("class ::C\u{df}; self; end")
+    assert_equal("C\u{df}", c.name, '[ruby-core:24600]')
+    c = eval("class C\u{df}; self; end")
+    assert_equal("TestClass::C\u{df}", c.name, '[ruby-core:24600]')
+  end
 end
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 066dd86011..4611abfbfb 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -741,4 +741,12 @@ class TestModule < Test::Unit::TestCase
     assert_equal(:bClass2, b.__send__(:bClass2))
     assert_equal(:bClass3, b.__send__(:bClass3))
   end
+
+
+  def test_nonascii_name
+    c = eval("class ::C\u{df}; self; end")
+    assert_equal("C\u{df}", c.name, '[ruby-core:24600]')
+    c = eval("class C\u{df}; self; end")
+    assert_equal("TestModule::C\u{df}", c.name, '[ruby-core:24600]')
+  end
 end
diff --git a/variable.c b/variable.c
index f5e6ff194f..1cea104bf0 100644
--- a/variable.c
+++ b/variable.c
@@ -215,6 +215,23 @@ rb_class_path(VALUE klass)
 }
 
 void
+rb_set_class_path_string(VALUE klass, VALUE under, VALUE name)
+{
+    VALUE str;
+
+    if (under == rb_cObject) {
+	str = rb_str_new_frozen(name);
+    }
+    else {
+	str = rb_str_dup(rb_class_path(under));
+	rb_str_cat2(str, "::");
+	rb_str_append(str, name);
+	OBJ_FREEZE(str);
+    }
+    rb_ivar_set(klass, classpath, str);
+}
+
+void
 rb_set_class_path(VALUE klass, VALUE under, const char *name)
 {
     VALUE str;