summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-20 12:46:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-20 12:46:35 +0000
commitcb3d17c727c6fa1bca1d39cb63d655112cce6727 (patch)
tree5ed91d180ed4edcc0a8d8ed2d611204c98d247fa
parentd77f1f670c661d4365d3ac90680972106a446363 (diff)
downloadruby-cb3d17c727c6fa1bca1d39cb63d655112cce6727.tar.gz
ruby-cb3d17c727c6fa1bca1d39cb63d655112cce6727.tar.xz
ruby-cb3d17c727c6fa1bca1d39cb63d655112cce6727.zip
* io.c (argf_getline): use receiver.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c7
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 <nobu@ruby-lang.org>
+
+ * io.c (argf_getline): use receiver.
+
Thu Mar 20 21:20:19 2008 Tadayoshi Funaba <tadf@dotrb.org>
* 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);