diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | class.c | 13 | ||||
-rw-r--r-- | eval.c | 8 | ||||
-rw-r--r-- | intern.h | 1 | ||||
-rw-r--r-- | object.c | 3 |
5 files changed, 28 insertions, 7 deletions
@@ -1,3 +1,13 @@ +Sun Dec 21 17:29:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * class.c (rb_check_inheritable): new function. [ruby-dev:22316] + + * intern.h: add prototype. + + * eval.c (superclass): use rb_check_inheritable(). + + * object.c (rb_class_initialize): check argument validity. + Sun Dec 21 16:25:10 2003 Tanaka Akira <akr@m17n.org> * lib/pathname.rb (Pathname#+): re-implemented to resolve ".." in @@ -178,6 +178,19 @@ rb_define_class_id(id, super) return klass; } +void +rb_check_inheritable(super) + VALUE super; +{ + if (TYPE(super) != T_CLASS) { + rb_raise(rb_eTypeError, "superclass must be a Class (%s given)", + rb_obj_classname(super)); + } + if (RBASIC(super)->flags & FL_SINGLETON) { + rb_raise(rb_eTypeError, "can't make subclass of virtual class"); + } +} + VALUE rb_class_inherited(super, klass) VALUE super, klass; @@ -1699,13 +1699,7 @@ superclass(self, node) } JUMP_TAG(state); } - if (TYPE(val) != T_CLASS) { - rb_raise(rb_eTypeError, "superclass must be a Class (%s given)", - rb_obj_classname(val)); - } - if (FL_TEST(val, FL_SINGLETON)) { - rb_raise(rb_eTypeError, "can't make subclass of virtual class"); - } + rb_check_inheritable(val); return val; } @@ -102,6 +102,7 @@ VALUE rb_class_init_copy _((VALUE, VALUE)); VALUE rb_singleton_class_clone _((VALUE)); void rb_singleton_class_attached _((VALUE,VALUE)); VALUE rb_make_metaclass _((VALUE, VALUE)); +void rb_check_inheritable _((VALUE)); VALUE rb_class_inherited _((VALUE, VALUE)); VALUE rb_define_class_id _((ID, VALUE)); VALUE rb_module_new _((void)); @@ -776,6 +776,9 @@ rb_class_initialize(argc, argv, klass) if (rb_scan_args(argc, argv, "01", &super) == 0) { super = rb_cObject; } + else { + rb_check_inheritable(super); + } RCLASS(klass)->super = super; rb_make_metaclass(klass, RBASIC(super)->klass); rb_mod_initialize(klass); |