[macruby-changes] [1616] MacRuby/branches/experimental/io.c

[source_changes at macosforge.org]

Revision: 1616
          http://trac.macosforge.org/projects/ruby/changeset/1616
Author:   pthomson at apple.com
Date:     2009-05-27 14:20:26 -0700 (Wed, 27 May 2009)
Log Message:
-----------
Added IO#lines, IO#chars, ARGF.lines, ARGF.chars and ARGF.bytes.

Modified Paths:
--------------
    MacRuby/branches/experimental/io.c

Modified: MacRuby/branches/experimental/io.c
===================================================================
--- MacRuby/branches/experimental/io.c	2009-05-27 21:10:10 UTC (rev 1615)
+++ MacRuby/branches/experimental/io.c	2009-05-27 21:20:26 UTC (rev 1616)
@@ -1427,10 +1427,12 @@
  *     f.lines.sort  #=> ["bar\n", "foo\n"]
  */
 
+static SEL sel_each_line = 0;
+
 static VALUE
 rb_io_lines(VALUE io, SEL sel, int argc, VALUE *argv)
 {
-rb_notimplement();
+    return rb_enumeratorize(io, sel_each_line, 0, NULL);
 }
 
 /*
@@ -1469,10 +1471,12 @@
  *     f.chars.sort  #=> ["e", "h", "l", "l", "o"]
  */
 
+static SEL sel_each_char = 0;
+
 static VALUE
 rb_io_chars(VALUE io, SEL sel)
 {
-rb_notimplement();
+	return rb_enumeratorize(io, sel_each_char, 0, NULL);
 }
 
 /*
@@ -3595,7 +3599,6 @@
 	ARGF_FORWARD(0, 0);
 	return rb_io_each_line(ARGF.current_file, sel, argc, argv);
 }
-
 static VALUE
 argf_each_byte(VALUE argf, SEL sel)
 {
@@ -3613,6 +3616,31 @@
 }
 
 static VALUE
+argf_lines(VALUE argf, SEL sel, int argc, VALUE *argv)
+{
+	next_argv();
+	ARGF_FORWARD(0, 0);
+	return rb_io_lines(ARGF.current_file, sel, argc, argv);
+}
+
+static VALUE
+argf_chars(VALUE argf, SEL sel)
+{
+	next_argv();
+	ARGF_FORWARD(0, 0);
+	return rb_io_chars(ARGF.current_file, sel);
+}
+
+static VALUE
+argf_bytes(VALUE argf, SEL sel)
+{
+	next_argv();
+	ARGF_FORWARD(0, 0);
+	return rb_io_bytes(ARGF.current_file, sel);
+}
+
+
+static VALUE
 argf_filename(VALUE argf, SEL sel)
 {
     next_argv();
@@ -4039,9 +4067,9 @@
     rb_objc_define_method(rb_cARGF, "each_line",  argf_each_line, -1);
     rb_objc_define_method(rb_cARGF, "each_byte",  argf_each_byte, 0);
     rb_objc_define_method(rb_cARGF, "each_char",  argf_each_char, 0);
-    rb_objc_define_method(rb_cARGF, "lines", argf_each_line, -1);
-    rb_objc_define_method(rb_cARGF, "bytes", argf_each_byte, 0);
-    rb_objc_define_method(rb_cARGF, "chars", argf_each_char, 0);
+    rb_objc_define_method(rb_cARGF, "lines", argf_lines, -1);
+    rb_objc_define_method(rb_cARGF, "bytes", argf_bytes, 0);
+    rb_objc_define_method(rb_cARGF, "chars", argf_chars, 0);
 
     rb_objc_define_method(rb_cARGF, "read",  argf_read, -1);
     rb_objc_define_method(rb_cARGF, "readpartial",  argf_readpartial, -1);
@@ -4108,4 +4136,7 @@
     rb_file_const("SYNC", INT2FIX(O_SYNC));
 
     sel_each_byte = sel_registerName("each_byte");
+	sel_each_char = sel_registerName("each_char");
+	sel_each_line = sel_registerName("each_line");
+	
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090527/3f4b636e/attachment.html>