kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/pathname/pathname.c (path_each_line): Pathname#each_line

Browse source 
translated from pathname.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-08-23 14:16:06 +00:00
parent 645114b25c
commit 526d246f71
4 changed files with 52 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Aug 23 23:14:21 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_each_line): Pathname#each_line
translated from pathname.rb.
Mon Aug 23 22:30:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (version.o): depends on both of version.h and

10
ext/pathname/lib/pathname.rb
View file

@ -484,16 +484,6 @@ class Pathname
end
class Pathname # * IO *
#
# #each_line iterates over the line in the file. It yields a String object
# for each line.
#
# This method has existed since 1.8.1.
#
def each_line(*args, &block) # :yield: line
IO.foreach(@path, *args, &block)
end
# See <tt>IO.read</tt>. Returns all data from the file, or the first +N+ bytes
# if specified.
def read(*args) IO.read(@path, *args) end

30
ext/pathname/pathname.c
View file

@ -232,6 +232,35 @@ path_realdirpath(int argc, VALUE *argv, VALUE self)
return rb_class_new_instance(1, &str, rb_obj_class(self));
}
/*
* call-seq:
* pathname.each_line {|line| ... }
* pathname.each_line(sep=$/ [, open_args]) {|line| block } -> nil
* pathname.each_line(limit [, open_args]) {|line| block } -> nil
* pathname.each_line(sep, limit [, open_args]) {|line| block } -> nil
* pathname.each_line(...) -> an_enumerator
*
* #each_line iterates over the line in the file. It yields a String object
* for each line.
*
* This method is availabel since 1.8.1.
*/
static VALUE
path_each_line(int argc, VALUE *argv, VALUE self)
{
VALUE args[4];
int n;
args[0] = get_strpath(self);
n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
if (rb_block_given_p()) {
return rb_block_call(rb_cIO, rb_intern("foreach"), 1+n, args, 0, 0);
}
else {
return rb_funcall2(rb_cIO, rb_intern("foreach"), 1+n, args);
}
}
/*
* See <tt>File.atime</tt>. Returns last access time.
*/
@ -691,6 +720,7 @@ Init_pathname()
rb_define_method(rb_cPathname, "sub_ext", path_sub_ext, 1);
rb_define_method(rb_cPathname, "realpath", path_realpath, -1);
rb_define_method(rb_cPathname, "realdirpath", path_realdirpath, -1);
rb_define_method(rb_cPathname, "each_line", path_each_line, -1);
rb_define_method(rb_cPathname, "atime", path_atime, 0);
rb_define_method(rb_cPathname, "ctime", path_ctime, 0);
rb_define_method(rb_cPathname, "mtime", path_mtime, 0);

17
test/pathname/test_pathname.rb
View file

@ -670,6 +670,23 @@ class TestPathname < Test::Unit::TestCase
a = []
Pathname("a").each_line {|line| a << line }
assert_equal(["1\n", "2\n"], a)
a = []
Pathname("a").each_line("2") {|line| a << line }
assert_equal(["1\n2", "\n"], a)
a = []
Pathname("a").each_line(1) {|line| a << line }
assert_equal(["1", "\n", "2", "\n"], a)
a = []
Pathname("a").each_line("2", 1) {|line| a << line }
assert_equal(["1", "\n", "2", "\n"], a)
a = []
enum = Pathname("a").each_line
enum.each {|line| a << line }
assert_equal(["1\n", "2\n"], a)
}
end