Skip to content
Browse files

Fix String#rpartition(/re/) against a multibyte string.

* string.c (rb_str_rpartition): Fix String#rpartition(/re/)
  against a multibyte string. [Bug #8138] [ruby-dev:47183]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent b4a2e26 commit 014236612a0be2f07ac6e645bd5a32ddbe4c8b0f @knu knu committed
Showing with 15 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +3 −2 string.c
  3. +7 −0 test/ruby/test_string.rb
View
5 ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 24 18:29:46 2013 Akinori MUSHA <knu@iDaemons.org>
+
+ * string.c (rb_str_rpartition): Fix String#rpartition(/re/)
+ against a multibyte string. [Bug #8138] [ruby-dev:47183]
+
Sun Mar 24 13:42:24 2013 Narihiro Nakamura <authornari@gmail.com>
* gc.c (GC_ENABLE_LAZY_SWEEP): new macro to switch lazy sweeping
View
5 string.c
@@ -7542,9 +7542,10 @@ rb_str_rpartition(VALUE str, VALUE sep)
if (regex) {
sep = rb_reg_nth_match(0, rb_backref_get());
}
- return rb_ary_new3(3, rb_str_substr(str, 0, pos),
+ return rb_ary_new3(3, rb_str_subseq(str, 0, pos),
sep,
- rb_str_substr(str,pos+str_strlen(sep,STR_ENC_GET(sep)),RSTRING_LEN(str)));
+ rb_str_subseq(str, pos+RSTRING_LEN(sep),
+ RSTRING_LEN(str)-pos-RSTRING_LEN(sep)));
}
/*
View
7 test/ruby/test_string.rb
@@ -1998,6 +1998,9 @@ def (hyphen = Object.new).to_str; "-"; end
s = S("a:".force_encoding(enc))
assert_equal([enc]*3, s.partition("|").map(&:encoding), bug6206)
end
+
+ assert_equal(["\u30E6\u30FC\u30B6", "@", "\u30C9\u30E1.\u30A4\u30F3"],
+ "\u30E6\u30FC\u30B6@\u30C9\u30E1.\u30A4\u30F3".partition(/[@.]/))
end
def test_rpartition
@@ -2013,6 +2016,10 @@ def (hyphen = Object.new).to_str; "-"; end
s = S("a:".force_encoding(enc))
assert_equal([enc]*3, s.rpartition("|").map(&:encoding), bug6206)
end
+
+ bug8138 = '[ruby-dev:47183]'
+ assert_equal(["\u30E6\u30FC\u30B6@\u30C9\u30E1", ".", "\u30A4\u30F3"],
+ "\u30E6\u30FC\u30B6@\u30C9\u30E1.\u30A4\u30F3".rpartition(/[@.]/), bug8138)
end
def test_setter

0 comments on commit 0142366

Please sign in to comment.
Something went wrong with that request. Please try again.