ruby-changes:28396
From: nagachika <ko1@a...>
Date: Thu, 25 Apr 2013 00:42:11 +0900 (JST)
Subject: [ruby-changes:28396] nagachika:r40448 (ruby_2_0_0): merge revision(s) 40440:
nagachika 2013-04-25 00:42:02 +0900 (Thu, 25 Apr 2013) New Revision: 40448 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40448 Log: merge revision(s) 40440: update doc. Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/file.c branches/ruby_2_0_0/version.h Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 40447) +++ ruby_2_0_0/version.h (revision 40448) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-25" -#define RUBY_PATCHLEVEL 167 +#define RUBY_PATCHLEVEL 168 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 Index: ruby_2_0_0/file.c =================================================================== --- ruby_2_0_0/file.c (revision 40447) +++ ruby_2_0_0/file.c (revision 40448) @@ -1135,6 +1135,8 @@ eaccess(const char *path, int mode) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1135 * or a symlink that points at a directory, and <code>false</code> * otherwise. * + * _file_name_ can be an IO object. + * * File.directory?(".") */ @@ -1157,6 +1159,8 @@ rb_file_directory_p(VALUE obj, VALUE fna https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1159 * File.pipe?(file_name) -> true or false * * Returns <code>true</code> if the named file is a pipe. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1218,6 +1222,8 @@ rb_file_symlink_p(VALUE obj, VALUE fname https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1222 * File.socket?(file_name) -> true or false * * Returns <code>true</code> if the named file is a socket. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1252,6 +1258,8 @@ rb_file_socket_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1258 * File.blockdev?(file_name) -> true or false * * Returns <code>true</code> if the named file is a block device. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1280,6 +1288,8 @@ rb_file_blockdev_p(VALUE obj, VALUE fnam https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1288 * File.chardev?(file_name) -> true or false * * Returns <code>true</code> if the named file is a character device. + * + * _file_name_ can be an IO object. */ static VALUE rb_file_chardev_p(VALUE obj, VALUE fname) @@ -1302,6 +1312,10 @@ rb_file_chardev_p(VALUE obj, VALUE fname https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1312 * File.exists?(file_name) -> true or false * * Return <code>true</code> if the named file exists. + * + * _file_name_ can be an IO object. + * + * "file exists" means that stat() or fstat() system call is successful. */ static VALUE @@ -1366,6 +1380,8 @@ rb_file_readable_real_p(VALUE obj, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1380 * <code>nil</code> otherwise. The meaning of the bits is platform * dependent; on Unix systems, see <code>stat(2)</code>. * + * _file_name_ can be an IO object. + * * File.world_readable?("/etc/passwd") #=> 420 * m = File.world_readable?("/etc/passwd") * sprintf("%o", m) #=> "644" @@ -1430,6 +1446,8 @@ rb_file_writable_real_p(VALUE obj, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1446 * <code>nil</code> otherwise. The meaning of the bits is platform * dependent; on Unix systems, see <code>stat(2)</code>. * + * _file_name_ can be an IO object. + * * File.world_writable?("/tmp") #=> 511 * m = File.world_writable?("/tmp") * sprintf("%o", m) #=> "777" @@ -1495,6 +1513,8 @@ rb_file_executable_real_p(VALUE obj, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1513 * * Returns <code>true</code> if the named file exists and is a * regular file. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1513,6 +1533,8 @@ rb_file_file_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1533 * * Returns <code>true</code> if the named file exists and has * a zero size. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1531,6 +1553,8 @@ rb_file_zero_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1553 * * Returns +nil+ if +file_name+ doesn't exist or has zero size, the size of the * file otherwise. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1550,6 +1574,8 @@ rb_file_size_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1574 * Returns <code>true</code> if the named file exists and the * effective used id of the calling process is the owner of * the file. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1579,6 +1605,8 @@ rb_file_rowned_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1605 * Returns <code>true</code> if the named file exists and the * effective group id of the calling process is the owner of * the file. Returns <code>false</code> on Windows. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1665,6 +1693,8 @@ rb_file_sticky_p(VALUE obj, VALUE fname) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1693 * * Returns <code>true</code> if the named files are identical. * + * _file_1_ and _file_2_ can be an IO object. + * * open("a", "w") {} * p File.identical?("a", "a") #=> true * p File.identical?("a", "./a") #=> true @@ -1729,6 +1759,8 @@ rb_file_identical_p(VALUE obj, VALUE fna https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1759 * File.size(file_name) -> integer * * Returns the size of <code>file_name</code>. + * + * _file_name_ can be an IO object. */ static VALUE @@ -1820,6 +1852,8 @@ rb_file_s_ftype(VALUE klass, VALUE fname https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1852 * * Returns the last access time for the named file as a Time object). * + * _file_name_ can be an IO object. + * * File.atime("testfile") #=> Wed Apr 09 08:51:48 CDT 2003 * */ @@ -1866,6 +1900,8 @@ rb_file_atime(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1900 * * Returns the modification time for the named file as a Time object. * + * _file_name_ can be an IO object. + * * File.mtime("testfile") #=> Tue Apr 08 12:58:04 CDT 2003 * */ @@ -1913,6 +1949,8 @@ rb_file_mtime(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1949 * directory information about the file was changed, not the file * itself). * + * _file_name_ can be an IO object. + * * Note that on Windows (NTFS), returns creation time (birth time). * * File.ctime("testfile") #=> Wed Apr 09 08:53:13 CDT 2003 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40440 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/