From 1182eb32cc0bb274bdce5e25b21868314f644d18 Mon Sep 17 00:00:00 2001 From: duerst Date: Tue, 7 Jun 2016 06:05:18 +0000 Subject: * regenc.h/c: Rename onigenc_not_support_case_map to onigenc_ascii_only_case_map. * regenc.h: Add definition of onigenc_single_byte_ascii_only_case_map. * enc/iso_8859_X.c, windows_125X.c, ascii.c, us-ascii.c, koi8_x.c: Replace onigenc_not_support_case_map by onigenc_single_byte_ascii_only_case_map. * enc/big5.c, cp949.c, emacs_mule.c, euc_X.c, gbX.c, shift_jis.c, windows_31j.c: Replace onigenc_not_support_case_map by onigenc_ascii_only_case_map. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 15 +++++++++++++++ enc/ascii.c | 2 +- enc/big5.c | 6 +++--- enc/cp949.c | 2 +- enc/emacs_mule.c | 2 +- enc/euc_jp.c | 2 +- enc/euc_kr.c | 2 +- enc/euc_tw.c | 2 +- enc/gb18030.c | 2 +- enc/gbk.c | 2 +- enc/iso_8859_1.c | 2 +- enc/iso_8859_10.c | 2 +- enc/iso_8859_11.c | 2 +- enc/iso_8859_13.c | 2 +- enc/iso_8859_14.c | 2 +- enc/iso_8859_15.c | 2 +- enc/iso_8859_16.c | 2 +- enc/iso_8859_2.c | 2 +- enc/iso_8859_3.c | 2 +- enc/iso_8859_4.c | 2 +- enc/iso_8859_5.c | 2 +- enc/iso_8859_6.c | 2 +- enc/iso_8859_7.c | 2 +- enc/iso_8859_8.c | 2 +- enc/iso_8859_9.c | 2 +- enc/koi8_r.c | 2 +- enc/koi8_u.c | 2 +- enc/shift_jis.c | 2 +- enc/us_ascii.c | 2 +- enc/windows_1250.c | 2 +- enc/windows_1251.c | 2 +- enc/windows_1252.c | 2 +- enc/windows_31j.c | 2 +- regenc.c | 2 +- regenc.h | 3 ++- 35 files changed, 52 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75ef68b516..dae08823d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Tue Jun 7 15:05:13 2016 Martin Duerst + + * regenc.h/c: Rename onigenc_not_support_case_map to + onigenc_ascii_only_case_map. + + * regenc.h: Add definition of onigenc_single_byte_ascii_only_case_map. + + * enc/iso_8859_X.c, windows_125X.c, ascii.c, us-ascii.c, koi8_x.c: + Replace onigenc_not_support_case_map by + onigenc_single_byte_ascii_only_case_map. + + * enc/big5.c, cp949.c, emacs_mule.c, euc_X.c, gbX.c, shift_jis.c, + windows_31j.c: Replace onigenc_not_support_case_map by + onigenc_ascii_only_case_map. + Tue Jun 7 14:57:09 2016 Kazuki Yamaguchi * ext/openssl/extconf.rb: Check for SSL_CTX_set_min_proto_version() diff --git a/enc/ascii.c b/enc/ascii.c index 85a69e3ac7..18e69234dd 100644 --- a/enc/ascii.c +++ b/enc/ascii.c @@ -54,7 +54,7 @@ OnigEncodingDefine(ascii, ASCII) = { ENCINDEX_ASCII, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("BINARY", "ASCII-8BIT") diff --git a/enc/big5.c b/enc/big5.c index 7c6c2d359f..16e97db02a 100644 --- a/enc/big5.c +++ b/enc/big5.c @@ -303,7 +303,7 @@ OnigEncodingDefine(big5, BIG5) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; @@ -340,7 +340,7 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS") @@ -377,6 +377,6 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; diff --git a/enc/cp949.c b/enc/cp949.c index c71b3fd7a8..2f37f73ad2 100644 --- a/enc/cp949.c +++ b/enc/cp949.c @@ -214,7 +214,7 @@ OnigEncodingDefine(cp949, CP949) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c index 6bd461558e..7f1e20bbd6 100644 --- a/enc/emacs_mule.c +++ b/enc/emacs_mule.c @@ -337,7 +337,7 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; diff --git a/enc/euc_jp.c b/enc/euc_jp.c index da12624410..cf9dda7af9 100644 --- a/enc/euc_jp.c +++ b/enc/euc_jp.c @@ -579,7 +579,7 @@ OnigEncodingDefine(euc_jp, EUC_JP) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/enc/euc_kr.c b/enc/euc_kr.c index 345a88cfb7..fbe70230bc 100644 --- a/enc/euc_kr.c +++ b/enc/euc_kr.c @@ -191,7 +191,7 @@ OnigEncodingDefine(euc_kr, EUC_KR) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("eucKR", "EUC-KR") diff --git a/enc/euc_tw.c b/enc/euc_tw.c index 4d89767947..d9a7eb2695 100644 --- a/enc/euc_tw.c +++ b/enc/euc_tw.c @@ -224,7 +224,7 @@ OnigEncodingDefine(euc_tw, EUC_TW) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("eucTW", "EUC-TW") diff --git a/enc/gb18030.c b/enc/gb18030.c index 6efc66e947..ed06845ee5 100644 --- a/enc/gb18030.c +++ b/enc/gb18030.c @@ -600,7 +600,7 @@ OnigEncodingDefine(gb18030, GB18030) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; diff --git a/enc/gbk.c b/enc/gbk.c index cead9b1dfc..5f443812a9 100644 --- a/enc/gbk.c +++ b/enc/gbk.c @@ -214,7 +214,7 @@ OnigEncodingDefine(gbk, GBK) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c index 96bc8af8b0..10f63cc28e 100644 --- a/enc/iso_8859_1.c +++ b/enc/iso_8859_1.c @@ -274,7 +274,7 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-1", "ISO-8859-1") diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c index 73e0682068..014e1d2c7a 100644 --- a/enc/iso_8859_10.c +++ b/enc/iso_8859_10.c @@ -243,7 +243,7 @@ OnigEncodingDefine(iso_8859_10, ISO_8859_10) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-10", "ISO-8859-10") diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c index 202522b20e..730bed2958 100644 --- a/enc/iso_8859_11.c +++ b/enc/iso_8859_11.c @@ -96,7 +96,7 @@ OnigEncodingDefine(iso_8859_11, ISO_8859_11) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-11", "ISO-8859-11") diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c index 3061b86935..492f7b2b53 100644 --- a/enc/iso_8859_13.c +++ b/enc/iso_8859_13.c @@ -236,7 +236,7 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-13", "ISO-8859-13") diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c index 9070d23452..70b326742d 100644 --- a/enc/iso_8859_14.c +++ b/enc/iso_8859_14.c @@ -245,7 +245,7 @@ OnigEncodingDefine(iso_8859_14, ISO_8859_14) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-14", "ISO-8859-14") diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c index faf5ba1a74..c36429c4be 100644 --- a/enc/iso_8859_15.c +++ b/enc/iso_8859_15.c @@ -239,7 +239,7 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-15", "ISO-8859-15") diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c index ee77bedf35..e5af1e8765 100644 --- a/enc/iso_8859_16.c +++ b/enc/iso_8859_16.c @@ -241,7 +241,7 @@ OnigEncodingDefine(iso_8859_16, ISO_8859_16) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-16", "ISO-8859-16") diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c index f710a14aa0..77e7fd6a67 100644 --- a/enc/iso_8859_2.c +++ b/enc/iso_8859_2.c @@ -239,7 +239,7 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-2", "ISO-8859-2") diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c index 40fab166fe..83e3fac1a1 100644 --- a/enc/iso_8859_3.c +++ b/enc/iso_8859_3.c @@ -239,7 +239,7 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-3", "ISO-8859-3") diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c index d2d60dd6e4..b3d0b7f313 100644 --- a/enc/iso_8859_4.c +++ b/enc/iso_8859_4.c @@ -242,7 +242,7 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-4", "ISO-8859-4") diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c index 7c085c0733..c538d56e31 100644 --- a/enc/iso_8859_5.c +++ b/enc/iso_8859_5.c @@ -229,7 +229,7 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-5", "ISO-8859-5") diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c index 3159d6fdf1..d0f5f0ac7f 100644 --- a/enc/iso_8859_6.c +++ b/enc/iso_8859_6.c @@ -96,7 +96,7 @@ OnigEncodingDefine(iso_8859_6, ISO_8859_6) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-6", "ISO-8859-6") diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c index 3388bfb8c1..06ffd174a9 100644 --- a/enc/iso_8859_7.c +++ b/enc/iso_8859_7.c @@ -226,7 +226,7 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_7) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-7", "ISO-8859-7") diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c index b4b4a38e47..9821eec07c 100644 --- a/enc/iso_8859_8.c +++ b/enc/iso_8859_8.c @@ -96,7 +96,7 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_8) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-8", "ISO-8859-8") diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c index 488ddf7d13..6303c85732 100644 --- a/enc/iso_8859_9.c +++ b/enc/iso_8859_9.c @@ -232,7 +232,7 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_9) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ISO8859-9", "ISO-8859-9") diff --git a/enc/koi8_r.c b/enc/koi8_r.c index e91f728d27..68813b4781 100644 --- a/enc/koi8_r.c +++ b/enc/koi8_r.c @@ -217,7 +217,7 @@ OnigEncodingDefine(koi8_r, KOI8_R) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("CP878", "KOI8-R") diff --git a/enc/koi8_u.c b/enc/koi8_u.c index 4fdf957c34..8f5b132958 100644 --- a/enc/koi8_u.c +++ b/enc/koi8_u.c @@ -221,6 +221,6 @@ OnigEncodingDefine(koi8_u, KOI8_U) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; diff --git a/enc/shift_jis.c b/enc/shift_jis.c index 71413ea2f5..ab180d5f10 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -566,7 +566,7 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/enc/us_ascii.c b/enc/us_ascii.c index 5893ad3fd9..15b7beee04 100644 --- a/enc/us_ascii.c +++ b/enc/us_ascii.c @@ -32,7 +32,7 @@ OnigEncodingDefine(us_ascii, US_ASCII) = { ENCINDEX_US_ASCII, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; ENC_ALIAS("ASCII", "US-ASCII") diff --git a/enc/windows_1250.c b/enc/windows_1250.c index a61d4f443a..689ed77e43 100644 --- a/enc/windows_1250.c +++ b/enc/windows_1250.c @@ -209,7 +209,7 @@ OnigEncodingDefine(windows_1250, Windows_1250) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/enc/windows_1251.c b/enc/windows_1251.c index e56c3b517f..826da725b3 100644 --- a/enc/windows_1251.c +++ b/enc/windows_1251.c @@ -200,7 +200,7 @@ OnigEncodingDefine(windows_1251, Windows_1251) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/enc/windows_1252.c b/enc/windows_1252.c index 4075462811..339df14e58 100644 --- a/enc/windows_1252.c +++ b/enc/windows_1252.c @@ -201,7 +201,7 @@ OnigEncodingDefine(windows_1252, Windows_1252) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_single_byte_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/enc/windows_31j.c b/enc/windows_31j.c index 20597abf65..e4ce906126 100644 --- a/enc/windows_31j.c +++ b/enc/windows_31j.c @@ -51,7 +51,7 @@ OnigEncodingDefine(windows_31j, Windows_31J) = { 0, ONIGENC_FLAG_NONE, #ifdef ONIG_CASE_MAPPING - onigenc_not_support_case_map, + onigenc_ascii_only_case_map, #endif /* ONIG_CASE_MAPPING */ }; /* diff --git a/regenc.c b/regenc.c index 5490b5e383..abc0c029c8 100644 --- a/regenc.c +++ b/regenc.c @@ -960,7 +960,7 @@ onigenc_property_list_init(int (*f)(void)) #ifdef ONIG_CASE_MAPPING extern int -onigenc_not_support_case_map (OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, +onigenc_ascii_only_case_map (OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc) { OnigCodePoint code; diff --git a/regenc.h b/regenc.h index a6edf17d0d..bc4ac4fa33 100644 --- a/regenc.h +++ b/regenc.h @@ -133,7 +133,8 @@ CONSTFUNC(ONIG_EXTERN int onigenc_not_support_get_ctype_code_range P_((OnigCtype PUREFUNC(ONIG_EXTERN int onigenc_is_mbc_newline_0x0a P_((const UChar* p, const UChar* end, OnigEncoding enc))); #ifdef ONIG_CASE_MAPPING - ONIG_EXTERN int onigenc_not_support_case_map P_((OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc)); + ONIG_EXTERN int onigenc_ascii_only_case_map P_((OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc)); + ONIG_EXTERN int onigenc_single_byte_ascii_only_case_map P_((OnigCaseFoldType* flagP, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, OnigUChar* to_end, const struct OnigEncodingTypeST* enc)); #endif /* ONIG_CASE_MAPPING */ -- cgit v1.2.3