* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 7 deletions

diff --git a/eval.c b/eval.c
index 10d52d6511..545d678be2 100644
--- a/eval.c
+++ b/eval.c
@@ -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;
 }