mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
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
This commit is contained in:
parent
5a7efe4dbf
commit
1032750aa6
7 changed files with 39 additions and 21 deletions
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
|||
Tue Jun 30 18:19:07 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* 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@ruby-lang.org>
|
||||
|
||||
* marshal.c (w_encoding): encodings need extra depth.
|
||||
|
|
4
hash.c
4
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 <code>eql?</code>).
|
||||
*/
|
||||
|
||||
|
|
4
object.c
4
object.c
|
@ -1304,8 +1304,8 @@ rb_mod_gt(VALUE mod, VALUE arg)
|
|||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
|
4
range.c
4
range.c
|
@ -112,8 +112,8 @@ range_exclude_end_p(VALUE range)
|
|||
*
|
||||
* 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
|
||||
|
|
29
string.c
29
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 <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 @@ rb_str_partition(VALUE str, VALUE sep)
|
|||
|
||||
/*
|
||||
* 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
|
||||
|
|
4
struct.c
4
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 <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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue