Merge from ruby_1_8.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-05-22 16:07:42 +00:00
parent ab3d450a54
commit 280f8df370
8 changed files with 73 additions and 45 deletions

8
eval.c
View file

@ -2242,8 +2242,8 @@ rb_mod_alias_method(mod, newname, oldname)
return mod;
}
static NODE*
copy_node_scope(node, rval)
NODE *
rb_copy_node_scope(node, rval)
NODE *node;
NODE *rval;
{
@ -3955,7 +3955,7 @@ rb_eval(self, n)
noex |= NOEX_NOSUPER;
}
defn = copy_node_scope(node->nd_defn, ruby_cref);
defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
rb_add_method(ruby_class, node->nd_mid, defn, noex);
if (scope_vmode == SCOPE_MODFUNC) {
rb_add_method(rb_singleton_class(ruby_class),
@ -3992,7 +3992,7 @@ rb_eval(self, n)
rb_warning("redefine %s", rb_id2name(node->nd_mid));
}
}
defn = copy_node_scope(node->nd_defn, ruby_cref);
defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
rb_add_method(klass, node->nd_mid, defn,
NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
result = Qnil;