summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c34
1 files changed, 2 insertions, 32 deletions
diff --git a/eval.c b/eval.c
index 541ea85..e1599fe 100644
--- a/eval.c
+++ b/eval.c
@@ -1715,37 +1715,6 @@ rb_eval_cmd(cmd, arg, level)
return val;
}
-static VALUE
-superclass(self, node)
- VALUE self;
- NODE *node;
-{
- VALUE val = Qnil; /* OK */
- int state;
-
- PUSH_TAG(PROT_NONE);
- if ((state = EXEC_TAG()) == 0) {
- val = rb_eval(self, node);
- }
- POP_TAG();
- if (state) {
- switch (nd_type(node)) {
- case NODE_COLON2:
- rb_raise(rb_eTypeError, "undefined superclass `%s'",
- rb_id2name(node->nd_mid));
- case NODE_CONST:
- rb_raise(rb_eTypeError, "undefined superclass `%s'",
- rb_id2name(node->nd_vid));
- default:
- break;
- }
- JUMP_TAG(state);
- }
- rb_check_inheritable(val);
-
- return val;
-}
-
#define ruby_cbase (ruby_cref->nd_clss)
static VALUE
@@ -3792,7 +3761,8 @@ rb_eval(self, n)
rb_raise(rb_eTypeError, "no outer class/module");
}
if (node->nd_super) {
- super = superclass(self, node->nd_super);
+ super = rb_eval(self, node->nd_super);
+ rb_check_inheritable(super);
}
else {
super = 0;