diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-15 16:18:41 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-15 16:18:41 +0000 |
commit | d2a5354255bab4d74c710ee8ff21f43998f33095 (patch) | |
tree | 1ec7bb66dc38e3d46bc69892fa6d18184386ec72 /regenc.c | |
parent | d198d64e0464c141f70c49880bf511ac3dcd1162 (diff) | |
download | ruby-d2a5354255bab4d74c710ee8ff21f43998f33095.tar.gz |
* reg*.c: Merge Onigmo 5.15.0 38a870960aa7370051a3544
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regenc.c')
-rw-r--r-- | regenc.c | 64 |
1 files changed, 33 insertions, 31 deletions
@@ -414,9 +414,7 @@ onigenc_ascii_apply_all_case_fold(OnigCaseFoldType flag ARG_UNUSED, OnigCodePoint code; int i, r; - for (i = 0; - i < (int )(sizeof(OnigAsciiLowerMap)/sizeof(OnigPairCaseFoldCodes)); - i++) { + for (i = 0; i < numberof(OnigAsciiLowerMap); i++) { code = OnigAsciiLowerMap[i].to; r = (*f)(OnigAsciiLowerMap[i].from, &code, 1, arg); if (r != 0) return r; @@ -431,8 +429,8 @@ onigenc_ascii_apply_all_case_fold(OnigCaseFoldType flag ARG_UNUSED, extern int onigenc_ascii_get_case_fold_codes_by_str(OnigCaseFoldType flag ARG_UNUSED, - const OnigUChar* p, const OnigUChar* end ARG_UNUSED, OnigCaseFoldCodeItem items[], - OnigEncoding enc ARG_UNUSED) + const OnigUChar* p, const OnigUChar* end ARG_UNUSED, + OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED) { if (0x41 <= *p && *p <= 0x5a) { items[0].byte_len = 1; @@ -570,9 +568,10 @@ onigenc_get_case_fold_codes_by_str_with_map(int map_size, extern int -onigenc_not_support_get_ctype_code_range(OnigCtype ctype, - OnigCodePoint* sb_out, const OnigCodePoint* ranges[], - OnigEncoding enc) +onigenc_not_support_get_ctype_code_range(OnigCtype ctype ARG_UNUSED, + OnigCodePoint* sb_out ARG_UNUSED, + const OnigCodePoint* ranges[] ARG_UNUSED, + OnigEncoding enc) { return ONIG_NO_SUPPORT_CONFIG; } @@ -589,7 +588,7 @@ onigenc_is_mbc_newline_0x0a(const UChar* p, const UChar* end, OnigEncoding enc A /* for single byte encodings */ extern int onigenc_ascii_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED, const UChar** p, - const UChar*end, UChar* lower, OnigEncoding enc ARG_UNUSED) + const UChar* end, UChar* lower, OnigEncoding enc ARG_UNUSED) { *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(**p); @@ -633,28 +632,31 @@ extern int onigenc_single_byte_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED) { if (code > 0xff) - rb_raise(rb_eRangeError, "%u out of char range", code); + rb_raise(rb_eRangeError, "%u out of char range", code); *buf = (UChar )(code & 0xff); return 1; } extern UChar* -onigenc_single_byte_left_adjust_char_head(const UChar* start ARG_UNUSED, const UChar* s, - const UChar* end, +onigenc_single_byte_left_adjust_char_head(const UChar* start ARG_UNUSED, + const UChar* s, + const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED) { return (UChar* )s; } extern int -onigenc_always_true_is_allowed_reverse_match(const UChar* s ARG_UNUSED, const UChar* end ARG_UNUSED, +onigenc_always_true_is_allowed_reverse_match(const UChar* s ARG_UNUSED, + const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED) { return TRUE; } extern int -onigenc_always_false_is_allowed_reverse_match(const UChar* s ARG_UNUSED, const UChar* end ARG_UNUSED, +onigenc_always_false_is_allowed_reverse_match(const UChar* s ARG_UNUSED, + const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED) { return FALSE; @@ -716,7 +718,7 @@ onigenc_mbn_mbc_case_fold(OnigEncoding enc, OnigCaseFoldType flag ARG_UNUSED, #if 0 extern int onigenc_mbn_is_mbc_ambiguous(OnigEncoding enc, OnigCaseFoldType flag, - const UChar** pp ARG_UNUSED, const UChar* end ARG_UNUSED) + const UChar** pp, const UChar* end ARG_UNUSED) { const UChar* p = *pp; @@ -791,27 +793,27 @@ extern int onigenc_minimum_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) { static const PosixBracketEntryType PBS[] = { - PosixBracketEntryInit("Alnum", ONIGENC_CTYPE_ALNUM), - PosixBracketEntryInit("Alpha", ONIGENC_CTYPE_ALPHA), - PosixBracketEntryInit("Blank", ONIGENC_CTYPE_BLANK), - PosixBracketEntryInit("Cntrl", ONIGENC_CTYPE_CNTRL), - PosixBracketEntryInit("Digit", ONIGENC_CTYPE_DIGIT), - PosixBracketEntryInit("Graph", ONIGENC_CTYPE_GRAPH), - PosixBracketEntryInit("Lower", ONIGENC_CTYPE_LOWER), - PosixBracketEntryInit("Print", ONIGENC_CTYPE_PRINT), - PosixBracketEntryInit("Punct", ONIGENC_CTYPE_PUNCT), - PosixBracketEntryInit("Space", ONIGENC_CTYPE_SPACE), - PosixBracketEntryInit("Upper", ONIGENC_CTYPE_UPPER), - PosixBracketEntryInit("XDigit", ONIGENC_CTYPE_XDIGIT), - PosixBracketEntryInit("ASCII", ONIGENC_CTYPE_ASCII), - PosixBracketEntryInit("Word", ONIGENC_CTYPE_WORD), + POSIX_BRACKET_ENTRY_INIT("Alnum", ONIGENC_CTYPE_ALNUM), + POSIX_BRACKET_ENTRY_INIT("Alpha", ONIGENC_CTYPE_ALPHA), + POSIX_BRACKET_ENTRY_INIT("Blank", ONIGENC_CTYPE_BLANK), + POSIX_BRACKET_ENTRY_INIT("Cntrl", ONIGENC_CTYPE_CNTRL), + POSIX_BRACKET_ENTRY_INIT("Digit", ONIGENC_CTYPE_DIGIT), + POSIX_BRACKET_ENTRY_INIT("Graph", ONIGENC_CTYPE_GRAPH), + POSIX_BRACKET_ENTRY_INIT("Lower", ONIGENC_CTYPE_LOWER), + POSIX_BRACKET_ENTRY_INIT("Print", ONIGENC_CTYPE_PRINT), + POSIX_BRACKET_ENTRY_INIT("Punct", ONIGENC_CTYPE_PUNCT), + POSIX_BRACKET_ENTRY_INIT("Space", ONIGENC_CTYPE_SPACE), + POSIX_BRACKET_ENTRY_INIT("Upper", ONIGENC_CTYPE_UPPER), + POSIX_BRACKET_ENTRY_INIT("XDigit", ONIGENC_CTYPE_XDIGIT), + POSIX_BRACKET_ENTRY_INIT("ASCII", ONIGENC_CTYPE_ASCII), + POSIX_BRACKET_ENTRY_INIT("Word", ONIGENC_CTYPE_WORD), }; - const PosixBracketEntryType *pb, *pbe; + const PosixBracketEntryType *pb; int len; len = onigenc_strlen(enc, p, end); - for (pbe = (pb = PBS) + sizeof(PBS)/sizeof(PBS[0]); pb < pbe; ++pb) { + for (pb = PBS; pb < PBS + numberof(PBS); pb++) { if (len == pb->len && onigenc_with_ascii_strnicmp(enc, p, end, pb->name, pb->len) == 0) return pb->ctype; |