ruby-changes:12731
From: yugui <ko1@a...>
Date: Sun, 9 Aug 2009 15:03:53 +0900 (JST)
Subject: [ruby-changes:12731] Ruby:r24450 (ruby_1_9_1): merges r24321 from trunk into ruby_1_9_1.
yugui 2009-08-08 19:56:14 +0900 (Sat, 08 Aug 2009) New Revision: 24450 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24450 Log: merges r24321 from trunk into ruby_1_9_1. -- * 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. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/include/ruby/intern.h branches/ruby_1_9_1/insns.def branches/ruby_1_9_1/test/ruby/test_class.rb branches/ruby_1_9_1/test/ruby/test_module.rb branches/ruby_1_9_1/variable.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/include/ruby/intern.h =================================================================== --- ruby_1_9_1/include/ruby/intern.h (revision 24449) +++ ruby_1_9_1/include/ruby/intern.h (revision 24450) @@ -728,6 +728,7 @@ 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); Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 24449) +++ ruby_1_9_1/ChangeLog (revision 24450) @@ -1,3 +1,11 @@ +Thu Jul 30 16:45:39 2009 Nobuyoshi Nakada <nobu@r...> + + * 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. + Sat Jul 25 17:49:03 2009 Nobuyoshi Nakada <nobu@r...> * io.c (argf_eof): should not have reached EOF before trying to Index: ruby_1_9_1/insns.def =================================================================== --- ruby_1_9_1/insns.def (revision 24449) +++ ruby_1_9_1/insns.def (revision 24450) @@ -908,7 +908,7 @@ 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); } @@ -935,7 +935,7 @@ 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; Index: ruby_1_9_1/variable.c =================================================================== --- ruby_1_9_1/variable.c (revision 24449) +++ ruby_1_9_1/variable.c (revision 24450) @@ -212,6 +212,23 @@ } 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; Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 24449) +++ ruby_1_9_1/version.h (revision 24450) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 255 +#define RUBY_PATCHLEVEL 256 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_1/test/ruby/test_module.rb =================================================================== --- ruby_1_9_1/test/ruby/test_module.rb (revision 24449) +++ ruby_1_9_1/test/ruby/test_module.rb (revision 24450) @@ -721,4 +721,11 @@ }.call end 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 Index: ruby_1_9_1/test/ruby/test_class.rb =================================================================== --- ruby_1_9_1/test/ruby/test_class.rb (revision 24449) +++ ruby_1_9_1/test/ruby/test_class.rb (revision 24450) @@ -144,4 +144,11 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/