From cb3d17c727c6fa1bca1d39cb63d655112cce6727 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 20 Mar 2008 12:46:35 +0000 Subject: * io.c (argf_getline): use receiver. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 119c6ecd1..568489767 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Mar 20 21:46:33 2008 Nobuyoshi Nakada + + * io.c (argf_getline): use receiver. + Thu Mar 20 21:20:19 2008 Tadayoshi Funaba * rational.c: some improvements (include Shin-ichiro HARA's diff --git a/io.c b/io.c index 64ddcd08a..3c041860c 100644 --- a/io.c +++ b/io.c @@ -5149,7 +5149,7 @@ argf_next_argv(VALUE argf) } static VALUE -argf_getline(int argc, VALUE *argv) +argf_getline(int argc, VALUE *argv, VALUE argf) { VALUE line; @@ -5232,7 +5232,7 @@ rb_f_gets(int argc, VALUE *argv) { VALUE line; - line = argf_getline(argc, argv); + line = argf_getline(argc, argv, argf); rb_lastline_set(line); return line; } @@ -5304,7 +5304,7 @@ rb_f_readlines(int argc, VALUE *argv) VALUE line, ary; ary = rb_ary_new(); - while (!NIL_P(line = argf_getline(argc, argv))) { + while (!NIL_P(line = argf_getline(argc, argv, argf))) { rb_ary_push(ary, line); } @@ -6883,6 +6883,7 @@ Init_IO(void) rb_define_global_const("STDERR", rb_stderr); rb_cARGF = rb_class_new(rb_cObject); + rb_set_class_path(rb_cARGF, rb_cObject, "ARGF.class"); rb_define_alloc_func(rb_cARGF, argf_alloc); rb_include_module(rb_cARGF, rb_mEnumerable); -- cgit