kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* enc/iso_8859_1.c, enc/iso_8859_15.c, enc/iso_8859_16.c:

Browse source 
Allign indenting to onigmo convention.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-07-06 10:24:50 +00:00
parent 45de86d76a
commit 9511067652
4 changed files with 109 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jul 6 19:24:48 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_1.c, enc/iso_8859_15.c, enc/iso_8859_16.c:
Allign indenting to onigmo convention.
Wed Jul 6 18:59:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Wed Jul 6 18:59:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb: * enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb:

28
enc/iso_8859_1.c
View file

@ -268,27 +268,27 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
while (*pp<end && to<to_end) { while (*pp<end && to<to_end) {
code = *(*pp)++; code = *(*pp)++;
if (code==SHARP_s) { if (code==SHARP_s) {
if (flags&ONIGENC_CASE_UPCASE) { if (flags&ONIGENC_CASE_UPCASE) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
*to++ = 'S'; *to++ = 'S';
code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S'; code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
} }
else if (flags&ONIGENC_CASE_FOLD) { else if (flags&ONIGENC_CASE_FOLD) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
*to++ = 's'; *to++ = 's';
code = 's'; code = 's';
} }
} }
else if (code==0xAA || code==0xBA) ; else if (code==0xAA || code==0xBA) ;
else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_UPPER) else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_UPPER)
&& (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) { && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
code += 0x20; code += 0x20;
} }
else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER) else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) { && (flags&ONIGENC_CASE_UPCASE)) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
code -= 0x20; code -= 0x20;
} }
*to++ = code; *to++ = code;
if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */ if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */

102
enc/iso_8859_15.c
View file

@ -226,59 +226,59 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
const struct OnigEncodingTypeST* enc) const struct OnigEncodingTypeST* enc)
{ {
OnigCodePoint code; OnigCodePoint code;
OnigUChar *to_start = to; OnigUChar *to_start = to;
OnigCaseFoldType flags = *flagP; OnigCaseFoldType flags = *flagP;
while (*pp<end && to<to_end) { while (*pp<end && to<to_end) {
code = *(*pp)++; code = *(*pp)++;
if (code==SHARP_s) { if (code==SHARP_s) {
if (flags&ONIGENC_CASE_UPCASE) { if (flags&ONIGENC_CASE_UPCASE) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
*to++ = 'S'; *to++ = 'S';
code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S'; code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
} }
else if (flags&ONIGENC_CASE_FOLD) { else if (flags&ONIGENC_CASE_FOLD) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
*to++ = 's'; *to++ = 's';
code = 's'; code = 's';
} }
}
else if (code==0xAA || code==0xBA) ;
else if ((EncISO_8859_15_CtypeTable[code] & BIT_CTYPE_UPPER)
&& (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
flags |= ONIGENC_CASE_MODIFIED;
if (code==0xA6)
code += 2;
else if (code==0xB4)
code += 4;
else if (code==0xBC)
code += 1;
else if (code==0xBE)
code += 0x41;
else
code += 0x20;
}
else if ((EncISO_8859_15_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) {
flags |= ONIGENC_CASE_MODIFIED;
if (code==0xA8)
code -= 2;
else if (code==0xB8)
code -= 4;
else if (code==0xBD)
code -= 1;
else if (code==0xFF)
code -= 0x41;
else
code -= 0x20;
}
*to++ = code;
if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */
flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE);
} }
*flagP = flags; else if (code==0xAA || code==0xBA) ;
return (int)(to-to_start); else if ((EncISO_8859_15_CtypeTable[code] & BIT_CTYPE_UPPER)
&& (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
flags |= ONIGENC_CASE_MODIFIED;
if (code==0xA6)
code += 2;
else if (code==0xB4)
code += 4;
else if (code==0xBC)
code += 1;
else if (code==0xBE)
code += 0x41;
else
code += 0x20;
}
else if ((EncISO_8859_15_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) {
flags |= ONIGENC_CASE_MODIFIED;
if (code==0xA8)
code -= 2;
else if (code==0xB8)
code -= 4;
else if (code==0xBD)
code -= 1;
else if (code==0xFF)
code -= 0x41;
else
code -= 0x20;
}
*to++ = code;
if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */
flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE);
}
*flagP = flags;
return (int)(to-to_start);
} }
#endif /* ONIG_CASE_MAPPING */ #endif /* ONIG_CASE_MAPPING */

65
enc/iso_8859_16.c
View file

@ -231,47 +231,60 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
OnigCodePoint code; OnigCodePoint code;
OnigUChar *to_start = to; OnigUChar *to_start = to;
OnigCaseFoldType flags = *flagP; OnigCaseFoldType flags = *flagP;
while (*pp<end && to<to_end) { while (*pp<end && to<to_end) {
code = *(*pp)++; code = *(*pp)++;
if (code==SHARP_s) { if (code==SHARP_s) {
if (flags&ONIGENC_CASE_UPCASE) { if (flags&ONIGENC_CASE_UPCASE) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
*to++ = 'S'; *to++ = 'S';
code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S'; code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
} }
else if (flags&ONIGENC_CASE_FOLD) { else if (flags&ONIGENC_CASE_FOLD) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
*to++ = 's'; *to++ = 's';
code = 's'; code = 's';
} }
} }
//else if (code==0xAA || code==0xBA) ;
else if ((EncISO_8859_16_CtypeTable[code] & BIT_CTYPE_UPPER) else if ((EncISO_8859_16_CtypeTable[code] & BIT_CTYPE_UPPER)
&& (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) { && (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
if(code==0xA1 || code==0xBC) code++; if (code==0xA1 || code==0xBC)
else if(code==0xA3 || code==0xAA || code==0xAF) code += 0x10; code++;
else if(code==0xA6 || code==0xAC) code += 0x02; else if (code==0xA3 || code==0xAA || code==0xAF)
else if(code==0xB2) code += 0x07; code += 0x10;
else if(code==0xB4) code += 0x04; else if (code==0xA6 || code==0xAC)
else if(code==0xBE) code += 0x41; code += 0x02;
else code += 0x20; else if (code==0xB2)
code += 0x07;
else if (code==0xB4)
code += 0x04;
else if (code==0xBE)
code += 0x41;
else
code += 0x20;
} }
else if ((EncISO_8859_16_CtypeTable[code]&BIT_CTYPE_LOWER) else if ((EncISO_8859_16_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) { && (flags&ONIGENC_CASE_UPCASE)) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
if(code==0xA2 || code==0xBD) code--; if (code==0xA2 || code==0xBD)
else if(code==0xB3 || code==0xBA || code==0xBF) code -= 0x10; code--;
else if(code==0xA8 || code==0xAE) code -= 0x02; else if (code==0xB3 || code==0xBA || code==0xBF)
else if(code==0xB9) code -= 0x07; code -= 0x10;
else if(code==0xB8) code -= 0x04; else if (code==0xA8 || code==0xAE)
else if(code==0xFF) code -= 0x41; code -= 0x02;
else code -= 0x20; else if (code==0xB9)
code -= 0x07;
else if (code==0xB8)
code -= 0x04;
else if (code==0xFF)
code -= 0x41;
else
code -= 0x20;
} }
*to++ = code; *to++ = code;
if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */ if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */
flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE); flags ^= (ONIGENC_CASE_UPCASE|ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_TITLECASE);
} }
*flagP = flags; *flagP = flags;
return (int)(to-to_start); return (int)(to-to_start);