string.c: fix coderange of reverse
* string.c (rb_str_reverse): reversed string is not a substring, and should not set coderange of the original string. [ruby-dev:49189] [Bug #11387] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7389ac15be
commit
61d807ccfa
@ -1,3 +1,9 @@
|
|||||||
|
Wed Jul 22 23:44:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* string.c (rb_str_reverse): reversed string is not a substring,
|
||||||
|
and should not set coderange of the original string.
|
||||||
|
[ruby-dev:49189] [Bug #11387]
|
||||||
|
|
||||||
Wed Jul 22 20:17:51 2015 Koichi Sasada <ko1@atdot.net>
|
Wed Jul 22 20:17:51 2015 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
* vm_core.h: modify layout of rb_iseq_constant_body.
|
* vm_core.h: modify layout of rb_iseq_constant_body.
|
||||||
|
21
string.c
21
string.c
@ -4802,13 +4802,14 @@ rb_str_reverse(VALUE str)
|
|||||||
rb_encoding *enc;
|
rb_encoding *enc;
|
||||||
VALUE rev;
|
VALUE rev;
|
||||||
char *s, *e, *p;
|
char *s, *e, *p;
|
||||||
int single = 1;
|
int cr;
|
||||||
|
|
||||||
if (RSTRING_LEN(str) <= 1) return rb_str_dup(str);
|
if (RSTRING_LEN(str) <= 1) return rb_str_dup(str);
|
||||||
enc = STR_ENC_GET(str);
|
enc = STR_ENC_GET(str);
|
||||||
rev = rb_str_new_with_class(str, 0, RSTRING_LEN(str));
|
rev = rb_str_new_with_class(str, 0, RSTRING_LEN(str));
|
||||||
s = RSTRING_PTR(str); e = RSTRING_END(str);
|
s = RSTRING_PTR(str); e = RSTRING_END(str);
|
||||||
p = RSTRING_END(rev);
|
p = RSTRING_END(rev);
|
||||||
|
cr = ENC_CODERANGE(str);
|
||||||
|
|
||||||
if (RSTRING_LEN(str) > 1) {
|
if (RSTRING_LEN(str) > 1) {
|
||||||
if (single_byte_optimizable(str)) {
|
if (single_byte_optimizable(str)) {
|
||||||
@ -4816,21 +4817,22 @@ rb_str_reverse(VALUE str)
|
|||||||
*--p = *s++;
|
*--p = *s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ENC_CODERANGE(str) == ENC_CODERANGE_VALID) {
|
else if (cr == ENC_CODERANGE_VALID) {
|
||||||
while (s < e) {
|
while (s < e) {
|
||||||
int clen = rb_enc_fast_mbclen(s, e, enc);
|
int clen = rb_enc_fast_mbclen(s, e, enc);
|
||||||
|
|
||||||
if (clen > 1 || (*s & 0x80)) single = 0;
|
|
||||||
p -= clen;
|
p -= clen;
|
||||||
memcpy(p, s, clen);
|
memcpy(p, s, clen);
|
||||||
s += clen;
|
s += clen;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
cr = rb_enc_asciicompat(enc) ?
|
||||||
|
ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID;
|
||||||
while (s < e) {
|
while (s < e) {
|
||||||
int clen = rb_enc_mbclen(s, e, enc);
|
int clen = rb_enc_mbclen(s, e, enc);
|
||||||
|
|
||||||
if (clen > 1 || (*s & 0x80)) single = 0;
|
if (clen > 1 || (*s & 0x80)) cr = ENC_CODERANGE_UNKNOWN;
|
||||||
p -= clen;
|
p -= clen;
|
||||||
memcpy(p, s, clen);
|
memcpy(p, s, clen);
|
||||||
s += clen;
|
s += clen;
|
||||||
@ -4839,15 +4841,8 @@ rb_str_reverse(VALUE str)
|
|||||||
}
|
}
|
||||||
STR_SET_LEN(rev, RSTRING_LEN(str));
|
STR_SET_LEN(rev, RSTRING_LEN(str));
|
||||||
OBJ_INFECT(rev, str);
|
OBJ_INFECT(rev, str);
|
||||||
if (ENC_CODERANGE(str) == ENC_CODERANGE_UNKNOWN) {
|
str_enc_copy(rev, str);
|
||||||
if (single) {
|
ENC_CODERANGE_SET(rev, cr);
|
||||||
ENC_CODERANGE_SET(str, ENC_CODERANGE_7BIT);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ENC_CODERANGE_SET(str, ENC_CODERANGE_VALID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rb_enc_cr_str_copy_for_substr(rev, str);
|
|
||||||
|
|
||||||
return rev;
|
return rev;
|
||||||
}
|
}
|
||||||
|
@ -1142,7 +1142,12 @@ class TestM17N < Test::Unit::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_reverse
|
def test_reverse
|
||||||
assert_equal(u("\xf0jihgfedcba"), u("abcdefghij\xf0").reverse)
|
bug11387 = '[ruby-dev:49189] [Bug #11387]'
|
||||||
|
s1 = u("abcdefghij\xf0")
|
||||||
|
s2 = s1.reverse
|
||||||
|
assert_not_predicate(s1, :valid_encoding?, bug11387)
|
||||||
|
assert_equal(u("\xf0jihgfedcba"), s2)
|
||||||
|
assert_not_predicate(s2, :valid_encoding?, bug11387)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_reverse_bang
|
def test_reverse_bang
|
||||||
|
Loading…
x
Reference in New Issue
Block a user