summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-27 04:13:58 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-27 04:13:58 +0000
commit77f483e3ffc0711c90f793ecefb376939d1e595b (patch)
tree6db09a78e7e977e4c4487a18171620aa995889bf
parent275a793c28c00b6b4a8e499db3db8fce71d97a17 (diff)
downloadruby-77f483e3ffc0711c90f793ecefb376939d1e595b.tar.gz
ruby-77f483e3ffc0711c90f793ecefb376939d1e595b.tar.xz
ruby-77f483e3ffc0711c90f793ecefb376939d1e595b.zip
* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 092bfbf4c..d70eee806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+<<<<<<< .mine
+Tue May 27 13:12:37 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+
Tue May 27 12:06:37 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
diff --git a/io.c b/io.c
index 6ccd0c133..7d4cb2cad 100644
--- a/io.c
+++ b/io.c
@@ -7650,6 +7650,9 @@ Init_IO(void)
rb_define_method(rb_cARGF, "each_line", argf_each_line, -1);
rb_define_method(rb_cARGF, "each_byte", argf_each_byte, 0);
rb_define_method(rb_cARGF, "each_char", argf_each_char, 0);
+ rb_define_method(rb_cARGF, "lines", argf_each_line, -1);
+ rb_define_method(rb_cARGF, "bytes", argf_each_byte, 0);
+ rb_define_method(rb_cARGF, "chars", argf_each_char, 0);
rb_define_method(rb_cARGF, "read", argf_read, -1);
rb_define_method(rb_cARGF, "readpartial", argf_readpartial, -1);