summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-24 13:18:54 (GMT)
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-24 13:18:54 (GMT)
commited77aff154497bd7fc9941277842481a8d0d00d4 (patch)
tree999d7d6aac1085292f45590bc0363435689063ad
parentf001a450f2263a74cc38e650361da161305d776f (diff)
* string.c (rb_str_rpartition): revert r39903, and convert byte offset
to char offset; the return value of rb_reg_search is byte offset, but other than it of rb_str_rpartition expects char offset. [Bug #8138] [ruby-dev:47183] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--re.c1
-rw-r--r--string.c6
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4925420..b5427fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Mar 24 22:13:51 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (rb_str_rpartition): revert r39903, and convert byte offset
+ to char offset; the return value of rb_reg_search is byte offset,
+ but other than it of rb_str_rpartition expects char offset.
+ [Bug #8138] [ruby-dev:47183]
+
Sun Mar 24 18:29:46 2013 Akinori MUSHA <knu@iDaemons.org>
* string.c (rb_str_rpartition): Fix String#rpartition(/re/)
diff --git a/re.c b/re.c
index 4e57971..91d34eb 100644
--- a/re.c
+++ b/re.c
@@ -1348,6 +1348,7 @@ rb_reg_adjust_startpos(VALUE re, VALUE str, long pos, int reverse)
return pos;
}
+/* returns byte offset */
long
rb_reg_search(VALUE re, VALUE str, long pos, int reverse)
{
diff --git a/string.c b/string.c
index 271afa7..dad27cf 100644
--- a/string.c
+++ b/string.c
@@ -7522,6 +7522,7 @@ rb_str_rpartition(VALUE str, VALUE sep)
if (RB_TYPE_P(sep, T_REGEXP)) {
pos = rb_reg_search(sep, str, pos, 1);
+ pos = rb_str_sublen(str, pos);
regex = TRUE;
}
else {
@@ -7542,10 +7543,9 @@ 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_subseq(str, 0, pos),
+ return rb_ary_new3(3, rb_str_substr(str, 0, pos),
sep,
- rb_str_subseq(str, pos+RSTRING_LEN(sep),
- RSTRING_LEN(str)-pos-RSTRING_LEN(sep)));
+ rb_str_substr(str,pos+str_strlen(sep,STR_ENC_GET(sep)),RSTRING_LEN(str)));
}
/*