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

* eval.c (superclass): undesirable "unexpected return" when the superclass is not a Class.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
aamine 2002-05-07 00:20:49 +00:00
parent 40225b8cb5
commit bc66ac228c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue May 7 09:17:51 2002 Minero Aoki <aamine@loveruby.net>
* eval.c (superclass): undesirable "unexpected return" when the
superclass is not a Class.
Sun May 5 06:53:45 2002 Akinori MUSHA <knu@iDaemons.org> Sun May 5 06:53:45 2002 Akinori MUSHA <knu@iDaemons.org>
* lib/mkmf.rb: exclude topdir from the system configuration * lib/mkmf.rb: exclude topdir from the system configuration

6
eval.c
View File

@ -1445,7 +1445,6 @@ superclass(self, node)
} }
POP_TAG(); POP_TAG();
if (state) { if (state) {
superclass_error:
switch (nd_type(node)) { switch (nd_type(node)) {
case NODE_COLON2: case NODE_COLON2:
rb_raise(rb_eTypeError, "undefined superclass `%s'", rb_raise(rb_eTypeError, "undefined superclass `%s'",
@ -1458,7 +1457,10 @@ superclass(self, node)
} }
JUMP_TAG(state); JUMP_TAG(state);
} }
if (TYPE(val) != T_CLASS) goto superclass_error; if (TYPE(val) != T_CLASS) {
rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
rb_class2name(CLASS_OF(val)));
}
if (FL_TEST(val, FL_SINGLETON)) { if (FL_TEST(val, FL_SINGLETON)) {
rb_raise(rb_eTypeError, "can't make subclass of virtual class"); rb_raise(rb_eTypeError, "can't make subclass of virtual class");
} }