summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-05 05:24:48 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-05 05:24:48 +0000
commit701adcdb596d7fa874a88d384aa8d4725b07c6aa (patch)
treed7b2028240d42274834ff37a838d08ef3dff33c3
parent87a414af2bc30f33b3f99383a264f0f8e900fe00 (diff)
downloadruby-701adcdb596d7fa874a88d384aa8d4725b07c6aa.tar.gz
ruby-701adcdb596d7fa874a88d384aa8d4725b07c6aa.tar.xz
ruby-701adcdb596d7fa874a88d384aa8d4725b07c6aa.zip
* eval_method.h (rb_add_method) : fix to check old_node
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval_method.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c1c74ec2c..635d636ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 5 13:59:53 2007 Koichi Sasada <ko1@atdot.net>
+
+ * eval_method.h (rb_add_method) : fix to check old_node
+
Fri Jan 5 12:03:07 2007 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_compile_each, set_block_local_tbl) :
diff --git a/eval_method.h b/eval_method.h
index 59e7cef8d..7f2c99d1f 100644
--- a/eval_method.h
+++ b/eval_method.h
@@ -146,13 +146,13 @@ rb_add_method(VALUE klass, ID mid, NODE * node, int noex)
if (nd_type(old_node->nd_body->nd_body) == NODE_CFUNC) {
yarv_check_redefinition_opt_method(old_node);
}
+ if (RTEST(ruby_verbose) && old_node->nd_cnt == 0 && old_node->nd_body) {
+ rb_warning("method redefined; discarding old %s", rb_id2name(mid));
+ }
}
if (klass == rb_cObject && node->nd_mid == init) {
rb_warn("redefining Object#initialize may cause infinite loop");
}
- if (RTEST(ruby_verbose) && old_node->nd_cnt == 0 && old_node->nd_body) {
- rb_warning("method redefined; discarding old %s", rb_id2name(mid));
- }
}
if (mid == object_id || mid == __send || mid == __send_bang) {