diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:56 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:56 +0000 |
commit | 25394cb929c8ddcfa976b7baef74f0e2f1edf12b (patch) | |
tree | c0c9903eacf91981ddfaaa9cad6a8f9a832c5d18 | |
parent | 32fdf95a3215e5828772f77f9d61b76e5eb8896b (diff) |
merges r30654 from trunk into ruby_1_9_2.
--
* string.c (=~): documentation fix; the return value is nil when
it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Jan 26 10:36:28 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (=~): documentation fix; the return value is nil when + it doesn't match. patched by Andrei Kulakov [ruby-core:34562] + Tue Jan 25 08:28:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_resize): get rid of out-of-bound access. @@ -2539,7 +2539,7 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str) * against <i>str</i>,and returns the position the match starts, or * <code>nil</code> if there is no match. Otherwise, invokes * <i>obj.=~</i>, passing <i>str</i> as an argument. The default - * <code>=~</code> in <code>Object</code> returns <code>false</code>. + * <code>=~</code> in <code>Object</code> returns <code>nil</code>. * * "cat o' 9 tails" =~ /\d/ #=> 7 * "cat o' 9 tails" =~ 9 #=> nil @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 173 +#define RUBY_PATCHLEVEL 174 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |