1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

insns.def: preserve encoding

Browse Source 
* insns.def (defineclass): preserve encoding of name in error
  messages for non-class super.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-06-28 17:10:00 +00:00
parent 491ace2dbe
commit b90a5f9334
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Mon Jun 29 02:06:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jun 29 02:08:01 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* insns.def (defineclass): preserve encoding of name in error
messages for non-class super.
* insns.def (defineclass): preserve encoding of name in error * insns.def (defineclass): preserve encoding of name in error
messages when already defined but type mismatch. messages when already defined but type mismatch.

4
insns.def
View File

@ -844,8 +844,8 @@ defineclass
if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags) && if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags) &&
!RB_TYPE_P(super, T_CLASS)) { !RB_TYPE_P(super, T_CLASS)) {
rb_raise(rb_eTypeError, "superclass must be a Class (%s given)", rb_raise(rb_eTypeError, "superclass must be a Class (% "PRIsVALUE" given)",
rb_obj_classname(super)); rb_obj_class(super));
} }
if (super == Qnil) { if (super == Qnil) {

10
test/ruby/test_class.rb
View File

@ -359,6 +359,16 @@ class TestClass < Test::Unit::TestCase
end end
end; end;
end end
m = Module.new
n = "M\u{1f5ff}"
c = m.module_eval "class #{n}; new; end"
assert_raise_with_message(TypeError, /#{n}/) {
eval <<-"end;"
class C < c
end
end;
}
end end
def test_cloned_singleton_method_added def test_cloned_singleton_method_added