aboutsummaryrefslogtreecommitdiffstats
path: root/enc
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-06 10:24:50 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-06 10:24:50 +0000
commit57544199b5f651b7a3c6fbd60e20c37231e37bb9 (patch)
treece72644ac9544467b226d30e4d2b5cd66830fefe /enc
parentc7e9565ec7ac13a70c455d827730046f5d1154e0 (diff)
downloadruby-57544199b5f651b7a3c6fbd60e20c37231e37bb9.tar.gz
* enc/iso_8859_1.c, enc/iso_8859_15.c, enc/iso_8859_16.c:
Allign indenting to onigmo convention. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rw-r--r--enc/iso_8859_1.c28
-rw-r--r--enc/iso_8859_15.c102
-rw-r--r--enc/iso_8859_16.c65
3 files changed, 104 insertions, 91 deletions
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index 634dd15ee3..d12a8dfc51 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -268,27 +268,27 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
while (*pp<end && to<to_end) {
code = *(*pp)++;
if (code==SHARP_s) {
- if (flags&ONIGENC_CASE_UPCASE) {
- flags |= ONIGENC_CASE_MODIFIED;
- *to++ = 'S';
- code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
- }
- else if (flags&ONIGENC_CASE_FOLD) {
- flags |= ONIGENC_CASE_MODIFIED;
- *to++ = 's';
- code = 's';
- }
+ if (flags&ONIGENC_CASE_UPCASE) {
+ flags |= ONIGENC_CASE_MODIFIED;
+ *to++ = 'S';
+ code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+ }
+ else if (flags&ONIGENC_CASE_FOLD) {
+ flags |= ONIGENC_CASE_MODIFIED;
+ *to++ = 's';
+ code = 's';
+ }
}
else if (code==0xAA || code==0xBA) ;
else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_UPPER)
&& (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
- flags |= ONIGENC_CASE_MODIFIED;
- code += 0x20;
+ flags |= ONIGENC_CASE_MODIFIED;
+ code += 0x20;
}
else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) {
- flags |= ONIGENC_CASE_MODIFIED;
- code -= 0x20;
+ flags |= ONIGENC_CASE_MODIFIED;
+ code -= 0x20;
}
*to++ = code;
if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
index 3767950d98..066a08c9fb 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -226,59 +226,59 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
const struct OnigEncodingTypeST* enc)
{
- OnigCodePoint code;
- OnigUChar *to_start = to;
- OnigCaseFoldType flags = *flagP;
+ OnigCodePoint code;
+ OnigUChar *to_start = to;
+ OnigCaseFoldType flags = *flagP;
- while (*pp<end && to<to_end) {
- code = *(*pp)++;
- if (code==SHARP_s) {
- if (flags&ONIGENC_CASE_UPCASE) {
- flags |= ONIGENC_CASE_MODIFIED;
- *to++ = 'S';
- code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
- }
- else if (flags&ONIGENC_CASE_FOLD) {
- flags |= ONIGENC_CASE_MODIFIED;
- *to++ = '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);
+ while (*pp<end && to<to_end) {
+ code = *(*pp)++;
+ if (code==SHARP_s) {
+ if (flags&ONIGENC_CASE_UPCASE) {
+ flags |= ONIGENC_CASE_MODIFIED;
+ *to++ = 'S';
+ code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+ }
+ else if (flags&ONIGENC_CASE_FOLD) {
+ flags |= ONIGENC_CASE_MODIFIED;
+ *to++ = 's';
+ code = 's';
+ }
}
- *flagP = flags;
- return (int)(to-to_start);
+ 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;
+ return (int)(to-to_start);
}
#endif /* ONIG_CASE_MAPPING */
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
index 2ed2f3c989..1374901e5b 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -231,47 +231,60 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
OnigCodePoint code;
OnigUChar *to_start = to;
OnigCaseFoldType flags = *flagP;
-
+
while (*pp<end && to<to_end) {
code = *(*pp)++;
if (code==SHARP_s) {
if (flags&ONIGENC_CASE_UPCASE) {
- flags |= ONIGENC_CASE_MODIFIED;
- *to++ = 'S';
- code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
+ flags |= ONIGENC_CASE_MODIFIED;
+ *to++ = 'S';
+ code = (flags&ONIGENC_CASE_TITLECASE) ? 's' : 'S';
}
else if (flags&ONIGENC_CASE_FOLD) {
- flags |= ONIGENC_CASE_MODIFIED;
- *to++ = 's';
- code = 's';
+ flags |= ONIGENC_CASE_MODIFIED;
+ *to++ = 's';
+ code = 's';
}
}
- //else if (code==0xAA || code==0xBA) ;
else if ((EncISO_8859_16_CtypeTable[code] & BIT_CTYPE_UPPER)
&& (flags & (ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD))) {
- flags |= ONIGENC_CASE_MODIFIED;
- if(code==0xA1 || code==0xBC) code++;
- else if(code==0xA3 || code==0xAA || code==0xAF) code += 0x10;
- else if(code==0xA6 || code==0xAC) code += 0x02;
- else if(code==0xB2) code += 0x07;
- else if(code==0xB4) code += 0x04;
- else if(code==0xBE) code += 0x41;
- else code += 0x20;
+ flags |= ONIGENC_CASE_MODIFIED;
+ if (code==0xA1 || code==0xBC)
+ code++;
+ else if (code==0xA3 || code==0xAA || code==0xAF)
+ code += 0x10;
+ else if (code==0xA6 || code==0xAC)
+ code += 0x02;
+ 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)
&& (flags&ONIGENC_CASE_UPCASE)) {
- flags |= ONIGENC_CASE_MODIFIED;
- if(code==0xA2 || code==0xBD) code--;
- else if(code==0xB3 || code==0xBA || code==0xBF) code -= 0x10;
- else if(code==0xA8 || code==0xAE) code -= 0x02;
- else if(code==0xB9) code -= 0x07;
- else if(code==0xB8) code -= 0x04;
- else if(code==0xFF) code -= 0x41;
- else code -= 0x20;
+ flags |= ONIGENC_CASE_MODIFIED;
+ if (code==0xA2 || code==0xBD)
+ code--;
+ else if (code==0xB3 || code==0xBA || code==0xBF)
+ code -= 0x10;
+ else if (code==0xA8 || code==0xAE)
+ code -= 0x02;
+ else if (code==0xB9)
+ code -= 0x07;
+ else if (code==0xB8)
+ code -= 0x04;
+ 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);
+ 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);