From 53a3e3ddd9e5fc88b9dfec30825cbc9e4e239cd4 Mon Sep 17 00:00:00 2001 From: duerst Date: Tue, 7 Jun 2016 07:44:19 +0000 Subject: * string.c (rb_str_downcase_bang): Switch to use primitive except if conversion can be done ASCII-only. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 31 +++---------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a6cf96d91..2126dcac14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 7 16:44:16 2016 Martin Duerst + + * string.c (rb_str_downcase_bang): Switch to use primitive except if + conversion can be done ASCII-only. + Tue Jun 7 16:13:36 2016 Martin Duerst * test/ruby/enc/test_case_comprehensive: Add regression tests for diff --git a/string.c b/string.c index c9828019e5..b9e3c42f7f 100644 --- a/string.c +++ b/string.c @@ -5948,11 +5948,7 @@ rb_str_downcase_bang(int argc, VALUE *argv, VALUE str) enc = STR_ENC_GET(str); rb_str_check_dummy_enc(enc); s = RSTRING_PTR(str); send = RSTRING_END(str); - if (rb_enc_unicode_p(enc)) { - str_shared_replace(str, rb_str_casemap(str, &flags, enc)); - modify = ONIGENC_CASE_MODIFIED & flags; - } - else if (single_byte_optimizable(str)) { + if (!(flags&ONIGENC_CASE_FOLD_TURKISH_AZERI) && ENC_CODERANGE(str)==ENC_CODERANGE_7BIT) { while (s < send) { unsigned int c = *(unsigned char*)s; @@ -5964,29 +5960,8 @@ rb_str_downcase_bang(int argc, VALUE *argv, VALUE str) } } else { - int ascompat = rb_enc_asciicompat(enc); - - while (s < send) { - unsigned int c; - int n; - - if (ascompat && (c = *(unsigned char*)s) < 0x80) { - if (rb_enc_isascii(c, enc) && 'A' <= c && c <= 'Z') { - *s = 'a' + (c - 'A'); - modify = 1; - } - s++; - } - else { - c = rb_enc_codepoint_len(s, send, &n, enc); - if (rb_enc_isupper(c, enc)) { - /* assuming toupper returns codepoint with same size */ - rb_enc_mbcput(rb_enc_tolower(c, enc), s, enc); - modify = 1; - } - s += n; - } - } + str_shared_replace(str, rb_str_casemap(str, &flags, enc)); + modify = ONIGENC_CASE_MODIFIED & flags; } if (modify) return str; -- cgit v1.2.3