diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-03 17:57:48 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-03 17:57:48 +0000 |
| commit | ed74723af4d28193f72242d4e6bc51a542aad118 (patch) | |
| tree | f8c45e53544238d8e206806e77ef8da4a042aead /enc/euc_jp.c | |
| parent | 52f9c1d2e173f07302ec263bf0026ded739a2d7f (diff) | |
| download | ruby-ed74723af4d28193f72242d4e6bc51a542aad118.tar.gz | |
* 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
Diffstat (limited to 'enc/euc_jp.c')
| -rw-r--r-- | enc/euc_jp.c | 42 |
1 files changed, 21 insertions, 21 deletions
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 }; |