From fd01ad48d00f612fc7690a086cd87a7287d052b0 Mon Sep 17 00:00:00 2001 From: kosako Date: Wed, 13 Apr 2016 11:22:47 +0900 Subject: [PATCH] fix indent --- src/utf16_be.c | 17 +++++++++-------- src/utf16_le.c | 17 +++++++++-------- src/utf32_be.c | 21 +++++++++++---------- src/utf32_le.c | 19 ++++++++++--------- src/utf8.c | 34 +++++++++++++++++----------------- 5 files changed, 56 insertions(+), 52 deletions(-) diff --git a/src/utf16_be.c b/src/utf16_be.c index d57ed77..da34d51 100644 --- a/src/utf16_be.c +++ b/src/utf16_be.c @@ -63,10 +63,11 @@ utf16be_is_mbc_newline(const UChar* p, const UChar* end) #ifdef USE_UNICODE_ALL_LINE_TERMINATORS if (( #ifndef USE_CRNL_AS_LINE_TERMINATOR - *(p+1) == 0x0d || + *(p+1) == 0x0d || #endif - *(p+1) == 0x85) && *p == 0x00) + *(p+1) == 0x85) && *p == 0x00) return 1; + if (*p == 0x20 && (*(p+1) == 0x29 || *(p+1) == 0x28)) return 1; #endif @@ -130,10 +131,10 @@ utf16be_mbc_case_fold(OnigCaseFoldType flag, #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) { if (*p == 0x49) { - *fold++ = 0x01; - *fold = 0x31; - (*pp) += 2; - return 2; + *fold++ = 0x01; + *fold = 0x31; + (*pp) += 2; + return 2; } } #endif @@ -171,9 +172,9 @@ utf16be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e if ((v | BIT_CTYPE_LOWER) != 0) { /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */ if (c >= 0xaa && c <= 0xba) - return FALSE; + return FALSE; else - return TRUE; + return TRUE; } return (v != 0 ? TRUE : FALSE); } diff --git a/src/utf16_le.c b/src/utf16_le.c index a31f01f..9acbe15 100644 --- a/src/utf16_le.c +++ b/src/utf16_le.c @@ -69,10 +69,11 @@ utf16le_is_mbc_newline(const UChar* p, const UChar* end) #ifdef USE_UNICODE_ALL_LINE_TERMINATORS if (( #ifndef USE_CRNL_AS_LINE_TERMINATOR - *p == 0x0d || + *p == 0x0d || #endif - *p == 0x85) && *(p+1) == 0x00) + *p == 0x85) && *(p+1) == 0x00) return 1; + if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28)) return 1; #endif @@ -132,10 +133,10 @@ utf16le_mbc_case_fold(OnigCaseFoldType flag, #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) { if (*p == 0x49) { - *fold++ = 0x31; - *fold = 0x01; - (*pp) += 2; - return 2; + *fold++ = 0x31; + *fold = 0x01; + (*pp) += 2; + return 2; } } #endif @@ -172,9 +173,9 @@ utf16le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, if ((v | BIT_CTYPE_LOWER) != 0) { /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */ if (c >= 0xaa && c <= 0xba) - return FALSE; + return FALSE; else - return TRUE; + return TRUE; } return (v != 0 ? TRUE : FALSE); } diff --git a/src/utf32_be.c b/src/utf32_be.c index 34cab48..5cc37b7 100644 --- a/src/utf32_be.c +++ b/src/utf32_be.c @@ -44,13 +44,14 @@ utf32be_is_mbc_newline(const UChar* p, const UChar* end) #ifdef USE_UNICODE_ALL_LINE_TERMINATORS if (( #ifndef USE_CRNL_AS_LINE_TERMINATOR - *(p+3) == 0x0d || + *(p+3) == 0x0d || #endif - *(p+3) == 0x85) - && *(p+2) == 0 && *(p+1) == 0 && *p == 0x00) + *(p+3) == 0x85) + && *(p+2) == 0 && *(p+1) == 0 && *p == 0x00) return 1; + if (*(p+2) == 0x20 && (*(p+3) == 0x29 || *(p+3) == 0x28) - && *(p+1) == 0 && *p == 0) + && *(p+1) == 0 && *p == 0) return 1; #endif } @@ -94,10 +95,10 @@ utf32be_mbc_case_fold(OnigCaseFoldType flag, #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) { if (*(p+3) == 0x49) { - *fold++ = 0x01; - *fold = 0x31; - (*pp) += 4; - return 4; + *fold++ = 0x01; + *fold = 0x31; + (*pp) += 4; + return 4; } } #endif @@ -134,9 +135,9 @@ utf32be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e if ((v | BIT_CTYPE_LOWER) != 0) { /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */ if (c >= 0xaa && c <= 0xba) - return FALSE; + return FALSE; else - return TRUE; + return TRUE; } return (v != 0 ? TRUE : FALSE); } diff --git a/src/utf32_le.c b/src/utf32_le.c index 2603806..8a94506 100644 --- a/src/utf32_le.c +++ b/src/utf32_le.c @@ -44,13 +44,14 @@ utf32le_is_mbc_newline(const UChar* p, const UChar* end) #ifdef USE_UNICODE_ALL_LINE_TERMINATORS if (( #ifndef USE_CRNL_AS_LINE_TERMINATOR - *p == 0x0d || + *p == 0x0d || #endif - *p == 0x85) - && *(p+1) == 0x00 && (p+2) == 0x00 && *(p+3) == 0x00) + *p == 0x85) + && *(p+1) == 0x00 && (p+2) == 0x00 && *(p+3) == 0x00) return 1; + if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28) - && *(p+2) == 0x00 && *(p+3) == 0x00) + && *(p+2) == 0x00 && *(p+3) == 0x00) return 1; #endif } @@ -91,8 +92,8 @@ utf32le_mbc_case_fold(OnigCaseFoldType flag, #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) { if (*p == 0x49) { - *fold++ = 0x31; - *fold++ = 0x01; + *fold++ = 0x31; + *fold++ = 0x01; } } else { @@ -110,7 +111,7 @@ utf32le_mbc_case_fold(OnigCaseFoldType flag, } else return onigenc_unicode_mbc_case_fold(ONIG_ENCODING_UTF32_LE, flag, pp, end, - fold); + fold); } #if 0 @@ -134,9 +135,9 @@ utf32le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e if ((v | BIT_CTYPE_LOWER) != 0) { /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */ if (c >= 0xaa && c <= 0xba) - return FALSE; + return FALSE; else - return TRUE; + return TRUE; } return (v != 0 ? TRUE : FALSE); } diff --git a/src/utf8.c b/src/utf8.c index 059261f..d6f4450 100644 --- a/src/utf8.c +++ b/src/utf8.c @@ -77,11 +77,11 @@ is_mbc_newline(const UChar* p, const UChar* end) #endif if (p + 1 < end) { if (*(p+1) == 0x85 && *p == 0xc2) /* U+0085 */ - return 1; + return 1; if (p + 2 < end) { - if ((*(p+2) == 0xa8 || *(p+2) == 0xa9) - && *(p+1) == 0x80 && *p == 0xe2) /* U+2028, U+2029 */ - return 1; + if ((*(p+2) == 0xa8 || *(p+2) == 0xa9) + && *(p+1) == 0x80 && *p == 0xe2) /* U+2028, U+2029 */ + return 1; } } #endif @@ -201,10 +201,10 @@ mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) { if (*p == 0x49) { - *fold++ = 0xc4; - *fold = 0xb1; - (*pp)++; - return 2; + *fold++ = 0xc4; + *fold = 0xb1; + (*pp)++; + return 2; } } #endif @@ -235,17 +235,17 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) if (*p == 0xc3) { int c = *(p + 1); if (c >= 0x80) { - if (c <= (UChar )0x9e) { /* upper */ - if (c == (UChar )0x97) return FALSE; - return TRUE; - } - else if (c >= (UChar )0xa0 && c <= (UChar )0xbe) { /* lower */ - if (c == (UChar )'\267') return FALSE; - return TRUE; - } + if (c <= (UChar )0x9e) { /* upper */ + if (c == (UChar )0x97) return FALSE; + return TRUE; + } + else if (c >= (UChar )0xa0 && c <= (UChar )0xbe) { /* lower */ + if (c == (UChar )'\267') return FALSE; + return TRUE; + } else if (c == (UChar )0x9f && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) { - return TRUE; + return TRUE; } } } -- 2.40.0