diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-13 08:56:40 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-13 08:56:40 +0000 |
| commit | 864619a3279fa16f5696db151f78792bdabe2c07 (patch) | |
| tree | 84c59180a5993dc67bb775946ce4c2167b9c4100 | |
| parent | 8bd8a87488689a813d33278f14c8aa38a99690a3 (diff) | |
| download | ruby-864619a3279fa16f5696db151f78792bdabe2c07.tar.gz ruby-864619a3279fa16f5696db151f78792bdabe2c07.tar.xz ruby-864619a3279fa16f5696db151f78792bdabe2c07.zip | |
* variable.c (generic_ivar_get): rb_attr_get should not warn.
[ruby-dev:26010]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | variable.c | 13 |
2 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Fri May 13 17:50:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * variable.c (generic_ivar_get): rb_attr_get should not warn. + [ruby-dev:26010] + Thu May 12 17:41:00 2005 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5 diff --git a/variable.c b/variable.c index b3824c30a..8b3ca3bc6 100644 --- a/variable.c +++ b/variable.c @@ -842,9 +842,10 @@ rb_generic_ivar_table(obj) } static VALUE -generic_ivar_get(obj, id) +generic_ivar_get(obj, id, warn) VALUE obj; ID id; + int warn; { st_table *tbl; VALUE val; @@ -856,8 +857,9 @@ generic_ivar_get(obj, id) } } } - - rb_warning("instance variable %s not initialized", rb_id2name(id)); + if (warn) { + rb_warning("instance variable %s not initialized", rb_id2name(id)); + } return Qnil; } @@ -1011,13 +1013,12 @@ ivar_get(obj, id, warn) break; default: if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) - return generic_ivar_get(obj, id); + return generic_ivar_get(obj, id, warn); break; } - if (warn && ruby_verbose) { + if (warn) { rb_warning("instance variable %s not initialized", rb_id2name(id)); } - return Qnil; } |