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

eval.c: fix message as same as previous versions

Browse Source 
* eval.c (rb_frozen_class_p): fix message for singleton class of
  class/module as same as previous versions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-13 01:22:01 +00:00
parent 92c1d1a950
commit 0fa9553604
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eval.c
View File

@ -412,8 +412,21 @@ rb_frozen_class_p(VALUE klass)
if (OBJ_FROZEN(klass)) { if (OBJ_FROZEN(klass)) {
const char *desc; const char *desc;
if (FL_TEST(klass, FL_SINGLETON)) if (FL_TEST(klass, FL_SINGLETON)) {
desc = "object"; desc = "object";
klass = rb_ivar_get(klass, id__attached__);
if (!SPECIAL_CONST_P(klass)) {
switch (BUILTIN_TYPE(klass)) {
case T_MODULE:
case T_ICLASS:
desc = "Module";
break;
case T_CLASS:
desc = "Class";
break;
}
}
}
else { else {
switch (BUILTIN_TYPE(klass)) { switch (BUILTIN_TYPE(klass)) {
case T_MODULE: case T_MODULE:

6
test/ruby/test_class.rb
View File

@ -389,8 +389,12 @@ class TestClass < Test::Unit::TestCase
obj = Object.new obj = Object.new
c = obj.singleton_class c = obj.singleton_class
obj.freeze obj.freeze
assert_raise(RuntimeError, /frozen object/) { assert_raise_with_message(RuntimeError, /frozen object/) {
c.class_eval {def f; end} c.class_eval {def f; end}
} }
c = Class.new.freeze
assert_raise_with_message(RuntimeError, /frozen Class/) {
def c.f; end
}
end end
end end