summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS15
-rw-r--r--io.c8
3 files changed, 21 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 5008674309..5081275c40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 27 13:38:51 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * io.c (Init_IO): Define {IO,ARGF}#{getbyte,readbyte}.
+
Tue May 27 13:26:15 2008 Akinori MUSHA <knu@iDaemons.org>
* ext/stringio/stringio.c (Init_stringio): Define #bytes and
diff --git a/NEWS b/NEWS
index e08acc885d..184441e775 100644
--- a/NEWS
+++ b/NEWS
@@ -171,17 +171,24 @@ with all sufficient information, see the ChangeLog file.
* IO#each
* IO#each_line
* IO#each_byte
- * IO#lines
- * IO#bytes
* IO.foreach
* ARGF.each
* ARGF.each_line
* ARGF.each_byte
- * ARGF.lines
- * ARGF.bytes
Return an enumerator if no block is given.
+ * IO#bytes
+ * IO#getbyte
+ * IO#lines
+ * IO#readbyte
+ * ARGF.bytes
+ * ARGF.getbyte
+ * ARGF.lines
+ * ARGF.readbyte
+
+ New methods.
+
* Method#receiver
* Method#name
* Method#owner
diff --git a/io.c b/io.c
index 8bf3747458..7242e1f3f1 100644
--- a/io.c
+++ b/io.c
@@ -5881,7 +5881,9 @@ Init_IO()
rb_define_method(rb_cIO, "gets", rb_io_gets_m, -1);
rb_define_method(rb_cIO, "readline", rb_io_readline, -1);
rb_define_method(rb_cIO, "getc", rb_io_getc, 0);
+ rb_define_method(rb_cIO, "getbyte", rb_io_getc, 0);
rb_define_method(rb_cIO, "readchar", rb_io_readchar, 0);
+ rb_define_method(rb_cIO, "readbyte", rb_io_readchar, 0);
rb_define_method(rb_cIO, "ungetc",rb_io_ungetc, 1);
rb_define_method(rb_cIO, "<<", rb_io_addstr, 1);
rb_define_method(rb_cIO, "flush", rb_io_flush, 0);
@@ -5943,8 +5945,8 @@ Init_IO()
rb_define_singleton_method(argf, "each", argf_each_line, -1);
rb_define_singleton_method(argf, "each_line", argf_each_line, -1);
rb_define_singleton_method(argf, "each_byte", argf_each_byte, 0);
- rb_define_singleton_method(argf, "lines", argf_lines, -1);
- rb_define_singleton_method(argf, "bytes", argf_bytes, 0);
+ rb_define_singleton_method(argf, "lines", argf_each_line, -1);
+ rb_define_singleton_method(argf, "bytes", argf_each_byte, 0);
rb_define_singleton_method(argf, "read", argf_read, -1);
rb_define_singleton_method(argf, "readlines", rb_f_readlines, -1);
@@ -5952,7 +5954,9 @@ Init_IO()
rb_define_singleton_method(argf, "gets", rb_f_gets, -1);
rb_define_singleton_method(argf, "readline", rb_f_readline, -1);
rb_define_singleton_method(argf, "getc", argf_getc, 0);
+ rb_define_singleton_method(argf, "getbyte", argf_getc, 0);
rb_define_singleton_method(argf, "readchar", argf_readchar, 0);
+ rb_define_singleton_method(argf, "readbyte", argf_readchar, 0);
rb_define_singleton_method(argf, "tell", argf_tell, 0);
rb_define_singleton_method(argf, "seek", argf_seek_m, -1);
rb_define_singleton_method(argf, "rewind", argf_rewind, 0);