diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-03 09:00:52 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-03 09:00:52 +0000 |
commit | 880d7af47a66f021712eac17adffac2686d08aad (patch) | |
tree | 71f148de518815dc3548c36896ad0ad142e9015a /eval.c | |
parent | 7cf8256075020e1dd80800807e3d92f3350511e6 (diff) | |
download | ruby-880d7af47a66f021712eac17adffac2686d08aad.tar.gz |
* struct.c (make_struct): remove redefining constant when
conflict. [ruby-dev:24210]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 34 |
1 files changed, 2 insertions, 32 deletions
@@ -1717,37 +1717,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 @@ -3772,7 +3741,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; |