1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c: Revert previous commit (possibility of endless loop).

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-06-08 13:22:28 +00:00
parent 5eb73eeda8
commit 872f9a498f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Jun 8 22:22:24 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* string.c: Revert previous commit (possibility of endless loop).
Wed Jun 8 21:57:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Wed Jun 8 21:57:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* string.c: Special-case :ascii option in rb_str_upcase_bang. * string.c: Special-case :ascii option in rb_str_upcase_bang.

11
string.c
View File

@ -5871,6 +5871,7 @@ static VALUE
rb_str_upcase_bang(int argc, VALUE *argv, VALUE str) rb_str_upcase_bang(int argc, VALUE *argv, VALUE str)
{ {
rb_encoding *enc; rb_encoding *enc;
int modify = 0;
OnigCaseFoldType flags = ONIGENC_CASE_UPCASE; OnigCaseFoldType flags = ONIGENC_CASE_UPCASE;
flags = check_case_options(argc, argv, flags); flags = check_case_options(argc, argv, flags);
@ -5886,17 +5887,17 @@ rb_str_upcase_bang(int argc, VALUE *argv, VALUE str)
if (rb_enc_isascii(c, enc) && 'a' <= c && c <= 'z') { if (rb_enc_isascii(c, enc) && 'a' <= c && c <= 'z') {
*s = 'A' + (c - 'a'); *s = 'A' + (c - 'a');
flags |= ONIGENC_CASE_MODIFIED; modify = 1;
} }
s++; s++;
} }
} }
else if (flags&ONIGENC_CASE_ASCII_ONLY) else {
rb_str_ascii_casemap(str, &flags, enc);
else
str_shared_replace(str, rb_str_casemap(str, &flags, enc)); str_shared_replace(str, rb_str_casemap(str, &flags, enc));
modify = ONIGENC_CASE_MODIFIED & flags;
}
if (ONIGENC_CASE_MODIFIED&flags) return str; if (modify) return str;
return Qnil; return Qnil;
} }