From 1032750aa6fb528694508dcd0533b40e9ad805cf Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Jul 2009 14:46:09 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 13 +++++++++++++ hash.c | 4 ++-- object.c | 4 ++-- range.c | 4 ++-- string.c | 29 +++++++++++++++++------------ struct.c | 4 ++-- version.h | 2 +- 7 files changed, 39 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index de8f58cfc5..fdab490812 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue Jun 30 18:19:07 2009 Yukihiro Matsumoto + + * 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 * marshal.c (w_encoding): encodings need extra depth. diff --git a/hash.c b/hash.c index d34604bec5..bfeee51491 100644 --- a/hash.c +++ b/hash.c @@ -1533,9 +1533,9 @@ recursive_hash(VALUE hash, VALUE dummy, int recur) /* * 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 eql?). */ diff --git a/object.c b/object.c index 6c418d25e2..59f80b1fff 100644 --- a/object.c +++ b/object.c @@ -1304,8 +1304,8 @@ rb_mod_gt(VALUE mod, VALUE arg) * * Comparison---Returns -1 if mod includes other_mod, 0 if * mod is the same as other_mod, and +1 if mod is - * included by other_mod or if mod has no relationship with - * other_mod. Returns nil if other_mod is + * included by other_mod. Returns nil if mod + * has no relationship with other_mod or if other_mod is * not a module. */ diff --git a/range.c b/range.c index bcbb9d9218..c418128af9 100644 --- a/range.c +++ b/range.c @@ -112,8 +112,8 @@ range_exclude_end_p(VALUE range) * * Returns true only if obj is a Range, has equivalent * beginning and end items (by comparing them with ==), and has - * the same #exclude_end? setting as rng. - * + * the same exclude_end? setting as rng. + * * (0..2) == (0..2) #=> true * (0..2) == Range.new(0,2) #=> true * (0..2) == (0...2) #=> false diff --git a/string.c b/string.c index 5440e37388..bf719b8eeb 100644 --- a/string.c +++ b/string.c @@ -6624,13 +6624,16 @@ rb_str_center(int argc, VALUE *argv, VALUE str) /* * call-seq: * str.partition(sep) => [head, sep, tail] - * - * Searches the string for sep and returns the part before - * it, the sep, and the part after it. If sep is not found, - * returns str and two empty strings. - * + * str.partition(regexp) => [head, match, tail] + * + * Searches sep or pattern (regexp) 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 str. + * * "hello".partition("l") #=> ["he", "l", "lo"] * "hello".partition("x") #=> ["hello", "", ""] + * "hello".partition(/.l/) #=> ["h", "el", "lo"] */ static VALUE @@ -6670,15 +6673,17 @@ rb_str_partition(VALUE str, VALUE sep) /* * call-seq: - * str.rpartition(sep) => [head, sep, tail] - * - * Searches sep in the string from the end of the string, and - * returns the part before it, the sep, and the part after it. - * If sep is not found, returns two empty strings and - * str. - * + * str.rpartition(sep) => [head, sep, tail] + * str.rpartition(regexp) => [head, match, tail] + * + * Searches sep or pattern (regexp) 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 str. + * * "hello".rpartition("l") #=> ["hel", "l", "o"] * "hello".rpartition("x") #=> ["", "", "hello"] + * "hello".rpartition(/.l/) #=> ["he", "ll", "o"] */ static VALUE diff --git a/struct.c b/struct.c index 0cc836123f..bda3cde409 100644 --- a/struct.c +++ b/struct.c @@ -298,8 +298,8 @@ rb_struct_define(const char *name, ...) * 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 nil. Passing too many + * parameters will raise an ArgumentError. * * The remaining methods listed in this section (class and instance) * are defined for this generated class. diff --git a/version.h b/version.h index a92b159bb6..6df12a6d04 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3