diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-18 14:30:17 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-18 14:30:17 +0000 |
commit | ddd9d609dca9844e1d62ef4dd58f5d62c9bebc0b (patch) | |
tree | 1cdebfa2fe2170d793fd70ece0e7dd9d97d1ede5 | |
parent | b4f940b76799a3cdcc5a39f34dfadd76e83bbd2f (diff) |
* eval.c (rb_call0): should not report uninitialized warning by
attribute reader method.
* variable.c (rb_attr_get): new function to get instance variable
without uninitialized warning.
* io.c (argf_to_io): should prefetch argv.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | intern.h | 2 | ||||
-rw-r--r-- | io.c | 1 | ||||
-rw-r--r-- | variable.c | 25 |
5 files changed, 37 insertions, 4 deletions
@@ -1,3 +1,13 @@ +Tue Feb 18 21:39:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (rb_call0): should not report uninitialized warning by + attribute reader method. + + * variable.c (rb_attr_get): new function to get instance variable + without uninitialized warning. + + * io.c (argf_to_io): should prefetch argv. + Tue Feb 18 00:13:50 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> * misc/ruby-mode.el (ruby-comment-column): customize comment @@ -4629,6 +4629,9 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper) if (argc != 0) { rb_raise(rb_eArgError, "wrong number of arguments(%d for 0)", argc); } + result = rb_attr_get(recv, body->nd_vid); + break; + case NODE_ATTRSET: /* for re-scoped/renamed method */ case NODE_ZSUPER: @@ -119,7 +119,6 @@ void rb_undef _((VALUE, ID)); void rb_define_protected_method _((VALUE, const char*, VALUE (*)(ANYARGS), int)); void rb_define_private_method _((VALUE, const char*, VALUE (*)(ANYARGS), int)); void rb_define_singleton_method _((VALUE, const char*, VALUE(*)(ANYARGS), int)); -void rb_define_private_method _((VALUE, const char*, VALUE(*)(ANYARGS), int)); VALUE rb_singleton_class _((VALUE)); /* compar.c */ int rb_cmpint _((VALUE)); @@ -437,6 +436,7 @@ VALUE rb_ivar_set _((VALUE, ID, VALUE)); VALUE rb_ivar_defined _((VALUE, ID)); VALUE rb_iv_set _((VALUE, const char*, VALUE)); VALUE rb_iv_get _((VALUE, const char*)); +VALUE rb_attr_get _((VALUE, ID)); VALUE rb_obj_instance_variables _((VALUE)); VALUE rb_obj_remove_instance_variable _((VALUE, VALUE)); void *rb_mod_const_at _((VALUE, void*)); @@ -3698,6 +3698,7 @@ argf_fileno() static VALUE argf_to_io() { + next_argv(); return current_file; } diff --git a/variable.c b/variable.c index 4a7bcd4ee5..9ac004e7f5 100644 --- a/variable.c +++ b/variable.c @@ -965,10 +965,11 @@ rb_copy_generic_ivar(clone, obj) } } -VALUE -rb_ivar_get(obj, id) +static VALUE +ivar_get(obj, id, warn) VALUE obj; ID id; + int warn; { VALUE val; @@ -984,12 +985,30 @@ rb_ivar_get(obj, id) return generic_ivar_get(obj, id); break; } - rb_warning("instance variable %s not initialized", rb_id2name(id)); + if (warn && ruby_verbose) { + rb_warning("instance variable %s not initialized", rb_id2name(id)); + } return Qnil; } VALUE +rb_ivar_get(obj, id) + VALUE obj; + ID id; +{ + return ivar_get(obj, id, Qtrue); +} + +VALUE +rb_attr_get(obj, id) + VALUE obj; + ID id; +{ + return ivar_get(obj, id, Qfalse); +} + +VALUE rb_ivar_set(obj, id, val) VALUE obj; ID id; |