ruby-changes:12356
From: yugui <ko1@a...>
Date: Sun, 12 Jul 2009 23:46:28 +0900 (JST)
Subject: [ruby-changes:12356] Ruby:r24051 (ruby_1_9_1): merges r23930 from trunk into ruby_1_9_1.
yugui 2009-07-12 23:46:09 +0900 (Sun, 12 Jul 2009) New Revision: 24051 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24051 Log: merges r23930 from trunk into ruby_1_9_1. -- * hash.c (rb_hash_hash): documentation fix. a patch from Marc-Andre Lafortune. [ruby-core:23943] * object.c (rb_mod_cmp): ditto. * range.c (range_eq): ditto. * string.c (rb_str_partition, rb_str_rpartition): ditto. * struct.c (rb_struct_s_def): ditto. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/hash.c branches/ruby_1_9_1/object.c branches/ruby_1_9_1/range.c branches/ruby_1_9_1/string.c branches/ruby_1_9_1/struct.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 24050) +++ ruby_1_9_1/ChangeLog (revision 24051) @@ -1,3 +1,16 @@ +Tue Jun 30 18:19:07 2009 Yukihiro Matsumoto <matz@r...> + + * hash.c (rb_hash_hash): documentation fix. a patch from + Marc-Andre Lafortune. [ruby-core:23943] + + * object.c (rb_mod_cmp): ditto. + + * range.c (range_eq): ditto. + + * string.c (rb_str_partition, rb_str_rpartition): ditto. + + * struct.c (rb_struct_s_def): ditto. + Wed Jul 1 08:46:11 2009 Nobuyoshi Nakada <nobu@r...> * marshal.c (w_encoding): encodings need extra depth. Index: ruby_1_9_1/string.c =================================================================== --- ruby_1_9_1/string.c (revision 24050) +++ ruby_1_9_1/string.c (revision 24051) @@ -6624,13 +6624,16 @@ /* * call-seq: * str.partition(sep) => [head, sep, tail] - * - * Searches the string for <i>sep</i> and returns the part before - * it, the <i>sep</i>, and the part after it. If <i>sep</i> is not found, - * returns <i>str</i> and two empty strings. - * + * str.partition(regexp) => [head, match, tail] + * + * Searches <i>sep</i> or pattern (<i>regexp</i>) in the string + * and returns the part before it, the match, and the part + * after it. + * If it is not found, returns two empty strings and <i>str</i>. + * * "hello".partition("l") #=> ["he", "l", "lo"] * "hello".partition("x") #=> ["hello", "", ""] + * "hello".partition(/.l/) #=> ["h", "el", "lo"] */ static VALUE @@ -6670,15 +6673,17 @@ /* * call-seq: - * str.rpartition(sep) => [head, sep, tail] - * - * Searches <i>sep</i> in the string from the end of the string, and - * returns the part before it, the <i>sep</i>, and the part after it. - * If <i>sep</i> is not found, returns two empty strings and - * <i>str</i>. - * + * str.rpartition(sep) => [head, sep, tail] + * str.rpartition(regexp) => [head, match, tail] + * + * Searches <i>sep</i> or pattern (<i>regexp</i>) in the string from the end + * of the string, and returns the part before it, the match, and the part + * after it. + * If it is not found, returns two empty strings and <i>str</i>. + * * "hello".rpartition("l") #=> ["hel", "l", "o"] * "hello".rpartition("x") #=> ["", "", "hello"] + * "hello".rpartition(/.l/) #=> ["he", "ll", "o"] */ static VALUE Index: ruby_1_9_1/object.c =================================================================== --- ruby_1_9_1/object.c (revision 24050) +++ ruby_1_9_1/object.c (revision 24051) @@ -1304,8 +1304,8 @@ * * Comparison---Returns -1 if <i>mod</i> includes <i>other_mod</i>, 0 if * <i>mod</i> is the same as <i>other_mod</i>, and +1 if <i>mod</i> is - * included by <i>other_mod</i> or if <i>mod</i> has no relationship with - * <i>other_mod</i>. Returns <code>nil</code> if <i>other_mod</i> is + * included by <i>other_mod</i>. Returns <code>nil</code> if <i>mod</i> + * has no relationship with <i>other_mod</i> or if <i>other_mod</i> is * not a module. */ Index: ruby_1_9_1/range.c =================================================================== --- ruby_1_9_1/range.c (revision 24050) +++ ruby_1_9_1/range.c (revision 24051) @@ -112,8 +112,8 @@ * * Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent * beginning and end items (by comparing them with <code>==</code>), and has - * the same #exclude_end? setting as <i>rng</t>. - * + * the same <code>exclude_end?</code> setting as <i>rng</i>. + * * (0..2) == (0..2) #=> true * (0..2) == Range.new(0,2) #=> true * (0..2) == (0...2) #=> false Index: ruby_1_9_1/struct.c =================================================================== --- ruby_1_9_1/struct.c (revision 24050) +++ ruby_1_9_1/struct.c (revision 24051) @@ -298,8 +298,8 @@ * which can then be used to create specific instances of the new * structure. The number of actual parameters must be * less than or equal to the number of attributes defined for this - * class; unset parameters default to \nil{}. Passing too many - * parameters will raise an \E{ArgumentError}. + * class; unset parameters default to <code>nil</code>. Passing too many + * parameters will raise an <code>ArgumentError</code>. * * The remaining methods listed in this section (class and instance) * are defined for this generated class. Index: ruby_1_9_1/hash.c =================================================================== --- ruby_1_9_1/hash.c (revision 24050) +++ ruby_1_9_1/hash.c (revision 24051) @@ -1533,9 +1533,9 @@ /* * call-seq: - * array.hash -> fixnum + * hsh.hash -> fixnum * - * Compute a hash-code for this array. Two arrays with the same content + * Compute a hash-code for this hash. Two hashes with the same content * will have the same hash code (and will compare using <code>eql?</code>). */ Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 24050) +++ ruby_1_9_1/version.h (revision 24051) @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-07-12" -#define RUBY_PATCHLEVEL 214 +#define RUBY_PATCHLEVEL 215 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/