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

merges r24321 from trunk into ruby_1_9_1.

Browse source 
--
* 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/branches/ruby_1_9_1@24450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-08-08 10:56:14 +00:00
parent 391fc1e8d9
commit 66b90d0f5c
7 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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.
Sat Jul 25 17:49:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_eof): should not have reached EOF before trying to

1
include/ruby/intern.h
View file

@ -728,6 +728,7 @@ VALUE rb_time_nano_new(time_t, long);
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);

4
insns.def
View file

@ -908,7 +908,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);
}
@ -935,7 +935,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;

7
test/ruby/test_class.rb
View file

@ -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

7
test/ruby/test_module.rb
View file

@ -721,4 +721,11 @@ class TestModule < Test::Unit::TestCase
}.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

17
variable.c
View file

@ -211,6 +211,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)
{

2
version.h
View file

@ -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