summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-07 08:18:42 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-07 08:18:42 +0000
commit8743f010c6f60cd1ac807f30f3e06fa57000ba25 (patch)
tree9bfac6725d1a69db33d6172141ed0e68baebf280
parent1f5784ecaf212f486fad6c586fe0dcedb778cd57 (diff)
* string.c (rb_str_upcase_bang, rb_str_capitalize_bang,
rb_str_swapcase_bang): Switch to use primitive. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c93
2 files changed, 16 insertions, 82 deletions
diff --git a/ChangeLog b/ChangeLog
index 2126dcac147..dbdfb17d0e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 7 17:18:39 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * string.c (rb_str_upcase_bang, rb_str_capitalize_bang,
+ rb_str_swapcase_bang): Switch to use primitive.
+
Tue Jun 7 16:44:16 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* string.c (rb_str_downcase_bang): Switch to use primitive except if
diff --git a/string.c b/string.c
index b9e3c42f7f1..5c62a28fcae 100644
--- a/string.c
+++ b/string.c
@@ -5848,21 +5848,16 @@ static VALUE
rb_str_upcase_bang(int argc, VALUE *argv, VALUE str)
{
rb_encoding *enc;
- char *s, *send;
int modify = 0;
- int n;
OnigCaseFoldType flags = ONIGENC_CASE_UPCASE;
flags = check_case_options(argc, argv, flags);
str_modify_keep_cr(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) {
+ char *s = RSTRING_PTR(str), *send = RSTRING_END(str);
+
while (s < send) {
unsigned int c = *(unsigned char*)s;
@@ -5874,28 +5869,8 @@ rb_str_upcase_bang(int argc, VALUE *argv, VALUE str)
}
}
else {
- int ascompat = rb_enc_asciicompat(enc);
-
- while (s < send) {
- unsigned int c;
-
- 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_islower(c, enc)) {
- /* assuming toupper returns codepoint with same size */
- rb_enc_mbcput(rb_enc_toupper(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;
@@ -5939,7 +5914,6 @@ static VALUE
rb_str_downcase_bang(int argc, VALUE *argv, VALUE str)
{
rb_encoding *enc;
- char *s, *send;
int modify = 0;
OnigCaseFoldType flags = ONIGENC_CASE_DOWNCASE;
@@ -5947,8 +5921,9 @@ rb_str_downcase_bang(int argc, VALUE *argv, VALUE str)
str_modify_keep_cr(str);
enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc);
- s = RSTRING_PTR(str); send = RSTRING_END(str);
if (!(flags&ONIGENC_CASE_FOLD_TURKISH_AZERI) && ENC_CODERANGE(str)==ENC_CODERANGE_7BIT) {
+ char *s = RSTRING_PTR(str), *send = RSTRING_END(str);
+
while (s < send) {
unsigned int c = *(unsigned char*)s;
@@ -6048,10 +6023,6 @@ static VALUE
rb_str_capitalize_bang(int argc, VALUE *argv, VALUE str)
{
rb_encoding *enc;
- char *s, *send;
- int modify = 0;
- unsigned int c;
- int n;
OnigCaseFoldType flags = ONIGENC_CASE_UPCASE | ONIGENC_CASE_TITLECASE;
flags = check_case_options(argc, argv, flags);
@@ -6059,29 +6030,9 @@ rb_str_capitalize_bang(int argc, VALUE *argv, VALUE str)
enc = STR_ENC_GET(str);
rb_str_check_dummy_enc(enc);
if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil;
- if (rb_enc_unicode_p(enc)) {
- str_shared_replace(str, rb_str_casemap(str, &flags, enc));
- modify = ONIGENC_CASE_MODIFIED & flags;
- }
- else {
- s = RSTRING_PTR(str); send = RSTRING_END(str);
- c = rb_enc_codepoint_len(s, send, &n, enc);
- if (rb_enc_islower(c, enc)) {
- rb_enc_mbcput(rb_enc_toupper(c, enc), s, enc);
- modify = 1;
- }
- s += n;
- while (s < send) {
- c = rb_enc_codepoint_len(s, send, &n, enc);
- if (rb_enc_isupper(c, enc)) {
- rb_enc_mbcput(rb_enc_tolower(c, enc), s, enc);
- modify = 1;
- }
- s += n;
- }
- }
+ str_shared_replace(str, rb_str_casemap(str, &flags, enc));
- if (modify) return str;
+ if (ONIGENC_CASE_MODIFIED&flags) return str;
return Qnil;
}
@@ -6125,37 +6076,15 @@ static VALUE
rb_str_swapcase_bang(int argc, VALUE *argv, VALUE str)
{
rb_encoding *enc;
- char *s, *send;
- int modify = 0;
- int n;
OnigCaseFoldType flags = ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE;
flags = check_case_options(argc, argv, flags);
str_modify_keep_cr(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 while (s < send) {
- unsigned int c = rb_enc_codepoint_len(s, send, &n, enc);
+ str_shared_replace(str, rb_str_casemap(str, &flags, 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;
- }
- else if (rb_enc_islower(c, enc)) {
- /* assuming tolower returns codepoint with same size */
- rb_enc_mbcput(rb_enc_toupper(c, enc), s, enc);
- modify = 1;
- }
- s += n;
- }
-
- if (modify) return str;
+ if (ONIGENC_CASE_MODIFIED&flags) return str;
return Qnil;
}