From ed74723af4d28193f72242d4e6bc51a542aad118 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 3 Jan 2008 17:57:48 +0000 Subject: * enc/euc_jp.c: remove eucjp_ prefix. breakpoint can be specified as euc_jp.c:mbc_enc_len. avoid needless conflict by merge. * enc/sjis.c: remove sjis_ prefix. * enc/utf8.c: remove utf8_ prefix. * enc/iso_8859_1.c: remove iso_8859_1_ prefix. * enc/iso_8859_2.c: remove iso_8859_2_ prefix. * enc/iso_8859_3.c: remove iso_8859_3_ prefix. * enc/iso_8859_4.c: remove iso_8859_4_ prefix. * enc/iso_8859_5.c: remove iso_8859_5_ prefix. * enc/iso_8859_6.c: remove iso_8859_6_ prefix. * enc/iso_8859_7.c: remove iso_8859_7_ prefix. * enc/iso_8859_8.c: remove iso_8859_8_ prefix. * enc/iso_8859_9.c: remove iso_8859_9_ prefix. * enc/iso_8859_10.c: remove iso_8859_10_ prefix. * enc/iso_8859_11.c: remove iso_8859_11_ prefix. * enc/iso_8859_13.c: remove iso_8859_13_ prefix. * enc/iso_8859_14.c: remove iso_8859_14_ prefix. * enc/iso_8859_15.c: remove iso_8859_15_ prefix. * enc/iso_8859_16.c: remove iso_8859_16_ prefix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 39 +++++++++++++++++++++++++++++++++++++++ enc/euc_jp.c | 42 +++++++++++++++++++++--------------------- enc/iso_8859_1.c | 16 ++++++++-------- enc/iso_8859_10.c | 16 ++++++++-------- enc/iso_8859_11.c | 4 ++-- enc/iso_8859_13.c | 16 ++++++++-------- enc/iso_8859_14.c | 16 ++++++++-------- enc/iso_8859_15.c | 16 ++++++++-------- enc/iso_8859_16.c | 16 ++++++++-------- enc/iso_8859_2.c | 16 ++++++++-------- enc/iso_8859_3.c | 16 ++++++++-------- enc/iso_8859_4.c | 16 ++++++++-------- enc/iso_8859_5.c | 16 ++++++++-------- enc/iso_8859_6.c | 4 ++-- enc/iso_8859_7.c | 16 ++++++++-------- enc/iso_8859_8.c | 4 ++-- enc/iso_8859_9.c | 16 ++++++++-------- enc/sjis.c | 46 +++++++++++++++++++++++----------------------- enc/utf8.c | 32 ++++++++++++++++---------------- 19 files changed, 201 insertions(+), 162 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8092f884fc..57067dc678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +Fri Jan 4 02:53:31 2008 Tanaka Akira + + * enc/euc_jp.c: remove eucjp_ prefix. breakpoint can be specified as + euc_jp.c:mbc_enc_len. avoid needless conflict by merge. + + * enc/sjis.c: remove sjis_ prefix. + + * enc/utf8.c: remove utf8_ prefix. + + * enc/iso_8859_1.c: remove iso_8859_1_ prefix. + + * enc/iso_8859_2.c: remove iso_8859_2_ prefix. + + * enc/iso_8859_3.c: remove iso_8859_3_ prefix. + + * enc/iso_8859_4.c: remove iso_8859_4_ prefix. + + * enc/iso_8859_5.c: remove iso_8859_5_ prefix. + + * enc/iso_8859_6.c: remove iso_8859_6_ prefix. + + * enc/iso_8859_7.c: remove iso_8859_7_ prefix. + + * enc/iso_8859_8.c: remove iso_8859_8_ prefix. + + * enc/iso_8859_9.c: remove iso_8859_9_ prefix. + + * enc/iso_8859_10.c: remove iso_8859_10_ prefix. + + * enc/iso_8859_11.c: remove iso_8859_11_ prefix. + + * enc/iso_8859_13.c: remove iso_8859_13_ prefix. + + * enc/iso_8859_14.c: remove iso_8859_14_ prefix. + + * enc/iso_8859_15.c: remove iso_8859_15_ prefix. + + * enc/iso_8859_16.c: remove iso_8859_16_ prefix. + Fri Jan 4 02:47:06 2008 Tanaka Akira * re.c (rb_reg_search): iterate onig_match for reverse mode. diff --git a/enc/euc_jp.c b/enc/euc_jp.c index 4e397ed25a..8c0df7db4e 100644 --- a/enc/euc_jp.c +++ b/enc/euc_jp.c @@ -114,7 +114,7 @@ static const signed char trans[][0x100] = { #undef F static int -eucjp_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) +mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) { int firstbyte = *p++; state_t s; @@ -132,7 +132,7 @@ eucjp_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) } static OnigCodePoint -eucjp_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) +mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) { int c, i, len; OnigCodePoint n; @@ -150,7 +150,7 @@ eucjp_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) } static int -eucjp_code_to_mbclen(OnigCodePoint code, OnigEncoding enc) +code_to_mbclen(OnigCodePoint code, OnigEncoding enc) { if (ONIGENC_IS_CODE_ASCII(code)) return 1; else if (code > 0xffffff) return 0; @@ -180,7 +180,7 @@ code_to_mbc_first(OnigCodePoint code) #endif static int -eucjp_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) +code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) { UChar *p = buf; @@ -196,7 +196,7 @@ eucjp_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) } static int -eucjp_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -221,7 +221,7 @@ eucjp_mbc_case_fold(OnigCaseFoldType flag, } static UChar* -eucjp_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) +left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) { /* In this encoding mb-trail bytes doesn't mix with single bytes. @@ -240,7 +240,7 @@ eucjp_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc } static int -eucjp_is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc) +is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc) { const UChar c = *s; if (c <= 0x7e || c == 0x8e || c == 0x8f) @@ -282,7 +282,7 @@ init_property_list(void) } static int -eucjp_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) +property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) { int ctype; @@ -296,14 +296,14 @@ eucjp_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) } static int -eucjp_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (ctype <= ONIGENC_MAX_STD_CTYPE) { if (code < 128) return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype); else { if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) { - return (eucjp_code_to_mbclen(code, enc) > 1 ? TRUE : FALSE); + return (code_to_mbclen(code, enc) > 1 ? TRUE : FALSE); } } } @@ -321,7 +321,7 @@ eucjp_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) } static int -eucjp_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, +get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], OnigEncoding enc) { if (ctype <= ONIGENC_MAX_STD_CTYPE) { @@ -343,21 +343,21 @@ eucjp_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, OnigEncodingDefine(euc_jp, EUC_JP) = { - eucjp_mbc_enc_len, + mbc_enc_len, "EUC-JP", /* name */ 3, /* max enc length */ 1, /* min enc length */ onigenc_is_mbc_newline_0x0a, - eucjp_mbc_to_code, - eucjp_code_to_mbclen, - eucjp_code_to_mbc, - eucjp_mbc_case_fold, + mbc_to_code, + code_to_mbclen, + code_to_mbc, + mbc_case_fold, onigenc_ascii_apply_all_case_fold, onigenc_ascii_get_case_fold_codes_by_str, - eucjp_property_name_to_ctype, - eucjp_is_code_ctype, - eucjp_get_ctype_code_range, - eucjp_left_adjust_char_head, - eucjp_is_allowed_reverse_match, + property_name_to_ctype, + is_code_ctype, + get_ctype_code_range, + left_adjust_char_head, + is_allowed_reverse_match, 0 }; diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c index 7453fe336e..0c85c8befb 100644 --- a/enc/iso_8859_1.c +++ b/enc/iso_8859_1.c @@ -102,7 +102,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_1_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -112,7 +112,7 @@ iso_8859_1_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_1_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -201,7 +201,7 @@ iso_8859_1_get_case_fold_codes_by_str(OnigCaseFoldType flag, } static int -iso_8859_1_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { const UChar* p = *pp; @@ -246,7 +246,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, #endif static int -iso_8859_1_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_1_CTYPE(code, ctype); @@ -263,11 +263,11 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_1_mbc_case_fold, - iso_8859_1_apply_all_case_fold, - iso_8859_1_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_1_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c index 9b8a035253..092941e873 100644 --- a/enc/iso_8859_10.c +++ b/enc/iso_8859_10.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_10_CtypeTable[256] = { }; static int -iso_8859_10_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -145,7 +145,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) #endif static int -iso_8859_10_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_10_CTYPE(code, ctype); @@ -203,7 +203,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_10_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -213,7 +213,7 @@ iso_8859_10_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_10_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -232,11 +232,11 @@ OnigEncodingDefine(iso_8859_10, ISO_8859_10) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_10_mbc_case_fold, - iso_8859_10_apply_all_case_fold, - iso_8859_10_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_10_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c index aa5d879e95..ce0fee7b21 100644 --- a/enc/iso_8859_11.c +++ b/enc/iso_8859_11.c @@ -68,7 +68,7 @@ static const unsigned short EncISO_8859_11_CtypeTable[256] = { }; static int -iso_8859_11_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_11_CTYPE(code, ctype); @@ -89,7 +89,7 @@ OnigEncodingDefine(iso_8859_11, ISO_8859_11) = { onigenc_ascii_apply_all_case_fold, onigenc_ascii_get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_11_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c index 799df9e5bd..0922566169 100644 --- a/enc/iso_8859_13.c +++ b/enc/iso_8859_13.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_13_CtypeTable[256] = { }; static int -iso_8859_13_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -149,7 +149,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) #endif static int -iso_8859_13_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_13_CTYPE(code, ctype); @@ -192,7 +192,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_13_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -202,7 +202,7 @@ iso_8859_13_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_13_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -221,11 +221,11 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_13_mbc_case_fold, - iso_8859_13_apply_all_case_fold, - iso_8859_13_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_13_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c index 225154a0a6..0d879169b2 100644 --- a/enc/iso_8859_14.c +++ b/enc/iso_8859_14.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_14_CtypeTable[256] = { }; static int -iso_8859_14_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -146,7 +146,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, #endif static int -iso_8859_14_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_14_CTYPE(code, ctype); @@ -205,7 +205,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_14_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -215,7 +215,7 @@ iso_8859_14_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_14_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -234,11 +234,11 @@ OnigEncodingDefine(iso_8859_14, ISO_8859_14) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_14_mbc_case_fold, - iso_8859_14_apply_all_case_fold, - iso_8859_14_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_14_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c index 339c7d9c32..c189252a67 100644 --- a/enc/iso_8859_15.c +++ b/enc/iso_8859_15.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_15_CtypeTable[256] = { }; static int -iso_8859_15_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -150,7 +150,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, #endif static int -iso_8859_15_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_15_CTYPE(code, ctype); @@ -199,7 +199,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_15_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -209,7 +209,7 @@ iso_8859_15_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_15_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -228,11 +228,11 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_15_mbc_case_fold, - iso_8859_15_apply_all_case_fold, - iso_8859_15_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_15_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c index 9bd42b4689..1fdaa50da5 100644 --- a/enc/iso_8859_16.c +++ b/enc/iso_8859_16.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_16_CtypeTable[256] = { }; static int -iso_8859_16_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -145,7 +145,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) #endif static int -iso_8859_16_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_16_CTYPE(code, ctype); @@ -201,7 +201,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_16_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -211,7 +211,7 @@ iso_8859_16_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_16_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -230,11 +230,11 @@ OnigEncodingDefine(iso_8859_16, ISO_8859_16) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_16_mbc_case_fold, - iso_8859_16_apply_all_case_fold, - iso_8859_16_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_16_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c index 9d49ffa5a4..57340b3e15 100644 --- a/enc/iso_8859_2.c +++ b/enc/iso_8859_2.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_2_CtypeTable[256] = { }; static int -iso_8859_2_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -190,7 +190,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_2_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -200,7 +200,7 @@ iso_8859_2_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_2_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -211,7 +211,7 @@ iso_8859_2_get_case_fold_codes_by_str(OnigCaseFoldType flag, } static int -iso_8859_2_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_2_CTYPE(code, ctype); @@ -228,11 +228,11 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_2_mbc_case_fold, - iso_8859_2_apply_all_case_fold, - iso_8859_2_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_2_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c index 33617844c9..90c2636d5c 100644 --- a/enc/iso_8859_3.c +++ b/enc/iso_8859_3.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_3_CtypeTable[256] = { }; static int -iso_8859_3_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -149,7 +149,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) #endif static int -iso_8859_3_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_3_CTYPE(code, ctype); @@ -199,7 +199,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { static int -iso_8859_3_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -209,7 +209,7 @@ iso_8859_3_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_3_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -228,11 +228,11 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_3_mbc_case_fold, - iso_8859_3_apply_all_case_fold, - iso_8859_3_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_3_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c index 49ce3bc30c..cc103cd924 100644 --- a/enc/iso_8859_4.c +++ b/enc/iso_8859_4.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_4_CtypeTable[256] = { }; static int -iso_8859_4_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -148,7 +148,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) #endif static int -iso_8859_4_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_4_CTYPE(code, ctype); @@ -201,7 +201,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_4_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -211,7 +211,7 @@ iso_8859_4_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_4_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -230,11 +230,11 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_4_mbc_case_fold, - iso_8859_4_apply_all_case_fold, - iso_8859_4_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_4_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c index 97443b1683..de7a0fd8bb 100644 --- a/enc/iso_8859_5.c +++ b/enc/iso_8859_5.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_5_CtypeTable[256] = { }; static int -iso_8859_5_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -129,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) #endif static int -iso_8859_5_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_5_CTYPE(code, ctype); @@ -189,7 +189,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_5_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -199,7 +199,7 @@ iso_8859_5_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_5_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -218,11 +218,11 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_5_mbc_case_fold, - iso_8859_5_apply_all_case_fold, - iso_8859_5_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_5_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c index db9643904a..c0f3027904 100644 --- a/enc/iso_8859_6.c +++ b/enc/iso_8859_6.c @@ -68,7 +68,7 @@ static const unsigned short EncISO_8859_6_CtypeTable[256] = { }; static int -iso_8859_6_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_6_CTYPE(code, ctype); @@ -89,7 +89,7 @@ OnigEncodingDefine(iso_8859_6, ISO_8859_6) = { onigenc_ascii_apply_all_case_fold, onigenc_ascii_get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_6_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c index b4d807d30d..2ff42ed53f 100644 --- a/enc/iso_8859_7.c +++ b/enc/iso_8859_7.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_7_CtypeTable[256] = { }; static int -iso_8859_7_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -137,7 +137,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, #endif static int -iso_8859_7_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_7_CTYPE(code, ctype); @@ -185,7 +185,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_7_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -195,7 +195,7 @@ iso_8859_7_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_7_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -215,11 +215,11 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_7) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_7_mbc_case_fold, - iso_8859_7_apply_all_case_fold, - iso_8859_7_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_7_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c index e0a70483a1..e0e600cd14 100644 --- a/enc/iso_8859_8.c +++ b/enc/iso_8859_8.c @@ -68,7 +68,7 @@ static const unsigned short EncISO_8859_8_CtypeTable[256] = { }; static int -iso_8859_8_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_8_CTYPE(code, ctype); @@ -89,7 +89,7 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_8) = { onigenc_ascii_apply_all_case_fold, onigenc_ascii_get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_8_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c index 51ce4c8f66..f811bac247 100644 --- a/enc/iso_8859_9.c +++ b/enc/iso_8859_9.c @@ -104,7 +104,7 @@ static const unsigned short EncISO_8859_9_CtypeTable[256] = { }; static int -iso_8859_9_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -149,7 +149,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) #endif static int -iso_8859_9_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (code < 256) return ENC_IS_ISO_8859_9_CTYPE(code, ctype); @@ -192,7 +192,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = { }; static int -iso_8859_9_apply_all_case_fold(OnigCaseFoldType flag, +apply_all_case_fold(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) { @@ -202,7 +202,7 @@ iso_8859_9_apply_all_case_fold(OnigCaseFoldType flag, } static int -iso_8859_9_get_case_fold_codes_by_str(OnigCaseFoldType flag, +get_case_fold_codes_by_str(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) @@ -221,11 +221,11 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_9) = { onigenc_single_byte_mbc_to_code, onigenc_single_byte_code_to_mbclen, onigenc_single_byte_code_to_mbc, - iso_8859_9_mbc_case_fold, - iso_8859_9_apply_all_case_fold, - iso_8859_9_get_case_fold_codes_by_str, + mbc_case_fold, + apply_all_case_fold, + get_case_fold_codes_by_str, onigenc_minimum_property_name_to_ctype, - iso_8859_9_is_code_ctype, + is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match diff --git a/enc/sjis.c b/enc/sjis.c index d526f66865..776940291d 100644 --- a/enc/sjis.c +++ b/enc/sjis.c @@ -115,7 +115,7 @@ static const signed char trans[][0x100] = { #undef F static int -sjis_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) +mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) { int firstbyte = *p++; state_t s; @@ -129,7 +129,7 @@ sjis_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) } static int -sjis_code_to_mbclen(OnigCodePoint code, OnigEncoding enc) +code_to_mbclen(OnigCodePoint code, OnigEncoding enc) { if (code < 256) { if (EncLen_SJIS[(int )code] == 1) @@ -145,7 +145,7 @@ sjis_code_to_mbclen(OnigCodePoint code, OnigEncoding enc) } static OnigCodePoint -sjis_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) +mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) { int c, i, len; OnigCodePoint n; @@ -164,7 +164,7 @@ sjis_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) } static int -sjis_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) +code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) { UChar *p = buf; @@ -179,7 +179,7 @@ sjis_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) } static int -sjis_mbc_case_fold(OnigCaseFoldType flag, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { @@ -214,13 +214,13 @@ is_mbc_ambiguous(OnigCaseFoldType flag, #if 0 static int -sjis_is_code_ctype(OnigCodePoint code, unsigned int ctype) +is_code_ctype(OnigCodePoint code, unsigned int ctype) { if (code < 128) return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype); else { if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) { - return (sjis_code_to_mbclen(code) > 1 ? TRUE : FALSE); + return (code_to_mbclen(code) > 1 ? TRUE : FALSE); } } @@ -229,7 +229,7 @@ sjis_is_code_ctype(OnigCodePoint code, unsigned int ctype) #endif static UChar* -sjis_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) +left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) { const UChar *p; int len; @@ -252,7 +252,7 @@ sjis_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) } static int -sjis_is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc) +is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc) { const UChar c = *s; return (SJIS_ISMB_TRAIL(c) ? FALSE : TRUE); @@ -292,7 +292,7 @@ init_property_list(void) } static int -sjis_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) +property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) { int ctype; @@ -306,14 +306,14 @@ sjis_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) } static int -sjis_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) +is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) { if (ctype <= ONIGENC_MAX_STD_CTYPE) { if (code < 128) return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype); else { if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) { - return (sjis_code_to_mbclen(code, enc) > 1 ? TRUE : FALSE); + return (code_to_mbclen(code, enc) > 1 ? TRUE : FALSE); } } } @@ -331,7 +331,7 @@ sjis_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc) } static int -sjis_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, +get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], OnigEncoding enc) { if (ctype <= ONIGENC_MAX_STD_CTYPE) { @@ -352,21 +352,21 @@ sjis_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out, } OnigEncodingDefine(sjis, SJIS) = { - sjis_mbc_enc_len, + mbc_enc_len, "Shift_JIS", /* name */ 2, /* max byte length */ 1, /* min byte length */ onigenc_is_mbc_newline_0x0a, - sjis_mbc_to_code, - sjis_code_to_mbclen, - sjis_code_to_mbc, - sjis_mbc_case_fold, + mbc_to_code, + code_to_mbclen, + code_to_mbc, + mbc_case_fold, onigenc_ascii_apply_all_case_fold, onigenc_ascii_get_case_fold_codes_by_str, - sjis_property_name_to_ctype, - sjis_is_code_ctype, - sjis_get_ctype_code_range, - sjis_left_adjust_char_head, - sjis_is_allowed_reverse_match, + property_name_to_ctype, + is_code_ctype, + get_ctype_code_range, + left_adjust_char_head, + is_allowed_reverse_match, 0 }; diff --git a/enc/utf8.c b/enc/utf8.c index 33cb0eed53..88daf8799e 100644 --- a/enc/utf8.c +++ b/enc/utf8.c @@ -217,7 +217,7 @@ static const signed char trans[][0x100] = { #undef F static int -utf8_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) +mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) { int firstbyte = *p++; state_t s; @@ -242,7 +242,7 @@ utf8_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc) } static int -utf8_is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc) +is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc) { if (p < end) { if (*p == 0x0a) return 1; @@ -267,7 +267,7 @@ utf8_is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc) } static OnigCodePoint -utf8_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) +mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) { int c, len; OnigCodePoint n; @@ -294,7 +294,7 @@ utf8_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) } static int -utf8_code_to_mbclen(OnigCodePoint code, OnigEncoding enc) +code_to_mbclen(OnigCodePoint code, OnigEncoding enc) { if ((code & 0xffffff80) == 0) return 1; else if ((code & 0xfffff800) == 0) return 2; @@ -311,7 +311,7 @@ utf8_code_to_mbclen(OnigCodePoint code, OnigEncoding enc) } static int -utf8_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) +code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) { #define UTF8_TRAILS(code, shift) (UChar )((((code) >> (shift)) & 0x3f) | 0x80) #define UTF8_TRAIL0(code) (UChar )(((code) & 0x3f) | 0x80) @@ -368,7 +368,7 @@ utf8_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) } static int -utf8_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, +mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* fold, OnigEncoding enc) { const UChar* p = *pp; @@ -433,7 +433,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) static int -utf8_get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out, +get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[], OnigEncoding enc) { *sb_out = 0x80; @@ -442,7 +442,7 @@ utf8_get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out, static UChar* -utf8_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) +left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc) { const UChar *p; @@ -463,20 +463,20 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, } OnigEncodingDefine(utf8, UTF8) = { - utf8_mbc_enc_len, + mbc_enc_len, "UTF-8", /* name */ 6, /* max byte length */ 1, /* min byte length */ - utf8_is_mbc_newline, - utf8_mbc_to_code, - utf8_code_to_mbclen, - utf8_code_to_mbc, - utf8_mbc_case_fold, + is_mbc_newline, + mbc_to_code, + code_to_mbclen, + code_to_mbc, + mbc_case_fold, onigenc_unicode_apply_all_case_fold, get_case_fold_codes_by_str, onigenc_unicode_property_name_to_ctype, onigenc_unicode_is_code_ctype, - utf8_get_ctype_code_range, - utf8_left_adjust_char_head, + get_ctype_code_range, + left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; -- cgit v1.2.3