diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-24 22:50:11 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-24 22:50:11 +0000 |
commit | 7a938f98f929b3c52b35df88c7ab141a062c764b (patch) | |
tree | 0a864c7e3f5c3c4d6e603b6e11afd25b288d4839 | |
parent | 74c714170501053c852d09bcc211162bece103ad (diff) | |
download | ruby-7a938f98f929b3c52b35df88c7ab141a062c764b.tar.gz |
* string.c (rb_str_partition): should use the converted result. a
patch from Marc-Andre Lafortune at [ruby-core:23540].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 1 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 2 |
3 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon May 25 07:50:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_partition): should use the converted result. a + patch from Marc-Andre Lafortune at [ruby-core:23540]. + Mon May 25 05:32:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/cgi/core.rb (CGI::HTTP_STATUS): typo fixed. a patch from @@ -6876,6 +6876,7 @@ rb_str_partition(VALUE str, VALUE sep) rb_raise(rb_eTypeError, "type mismatch: %s given", rb_obj_classname(sep)); } + sep = tmp; pos = rb_str_index(str, sep, 0); } if (pos < 0) { diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index e87b6d3c8f..4a784b18f1 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1704,6 +1704,8 @@ class TestString < Test::Unit::TestCase assert_equal(%w(he l lo), "hello".partition(/l/)) assert_equal(%w(he l lo), "hello".partition("l")) assert_raise(TypeError) { "hello".partition(1) } + def (hyphen = Object.new).to_str; "-"; end + assert_equal(%w(foo - bar), "foo-bar".partition(hyphen), '[ruby-core:23540]') end def test_rpartition |