naruse	2012-11-26 16:37:25 +0900 (Mon, 26 Nov 2012)

  New Revision: 37851

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37851

  Log:
    * io.c (argf_each_codepoint): add missing ARGF#codepoints [Bug #7438]

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/test/ruby/test_argf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37850)
+++ ChangeLog	(revision 37851)
@@ -1,3 +1,7 @@
+Mon Nov 26 16:36:13 2012  NARUSE, Yui  <naruse@r...>
+
+	* io.c (argf_each_codepoint): add missing ARGF#codepoints [Bug #7438]
+
 Mon Nov 26 15:50:29 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* bignum.c (bigdivrem): restart calculation when bigdivrem1 was
Index: io.c
===================================================================
--- io.c	(revision 37850)
+++ io.c	(revision 37851)
@@ -10862,6 +10862,36 @@
 
 /*
  *  call-seq:
+ *     ARGF.codepoints      {|codepoint| block }  -> ARGF
+ *     ARGF.codepoints                       -> an_enumerator
+ *
+ *     ARGF.each_codepoint  {|codepoint| block }  -> ARGF
+ *     ARGF.each_codepoint                   -> an_enumerator
+ *
+ *  Iterates over each codepoint of each file in +ARGF+.
+ *
+ *  This method allows you to treat the files supplied on the command line as
+ *  a single file consisting of the concatenation of each named file. After
+ *  the last codepoint of the first file has been returned, the first
+ *  codepoint of the second file is returned. The +ARGF.filename+ method can
+ *  be used to determine the name of the file in which the current codepoint
+ *  appears.
+ *
+ *  If no block is given, an enumerator is returned instead.
+ */
+static VALUE
+argf_each_codepoint(VALUE argf)
+{
+    RETURN_ENUMERATOR(argf, 0, 0);
+    for (;;) {
+	if (!next_argv()) return argf;
+	rb_block_call(ARGF.current_file, rb_intern("each_codepoint"), 0, 0, 0, 0);
+	ARGF.next_p = 1;
+    }
+}
+
+/*
+ *  call-seq:
  *     ARGF.filename  -> String
  *     ARGF.path      -> String
  *
@@ -11557,9 +11587,11 @@
     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, "each_codepoint",  argf_each_codepoint, 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, "codepoints", argf_each_codepoint, 0);
 
     rb_define_method(rb_cARGF, "read",  argf_read, -1);
     rb_define_method(rb_cARGF, "readpartial",  argf_readpartial, -1);
Index: test/ruby/test_argf.rb
===================================================================
--- test/ruby/test_argf.rb	(revision 37850)
+++ test/ruby/test_argf.rb	(revision 37851)
@@ -770,4 +770,28 @@
     bug5952 = '[ruby-dev:45160]'
     assert_ruby_status(["-e", "2.times {STDIN.tty?; readlines}"], "", bug5952)
   end
+
+  def test_bytes
+    ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
+      print Marshal.dump(ARGF.bytes.to_a)
+    SRC
+      assert_equal([49, 10, 50, 10, 51, 10, 52, 10, 53, 10, 54, 10], Marshal.load(f.read))
+    end
+  end
+
+  def test_chars
+    ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
+      print Marshal.dump(ARGF.chars.to_a)
+    SRC
+      assert_equal(["1", "\n", "2", "\n", "3", "\n", "4", "\n", "5", "\n", "6", "\n"], Marshal.load(f.read))
+    end
+  end
+
+  def test_codepoints
+    ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
+      print Marshal.dump(ARGF.codepoints.to_a)
+    SRC
+      assert_equal([49, 10, 50, 10, 51, 10, 52, 10, 53, 10, 54, 10], Marshal.load(f.read))
+    end
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/