set flag member values in OnigEncoding

diff --git a/src/ascii.c b/src/ascii.c
index 622e963b42933e5f1ae7d7439da6222e9fc05968..eb389448de9002bf9e1b90678197ca7300cb152c 100644 (file)
--- a/src/ascii.c
+++ b/src/ascii.c
@@ -113,5 +113,6 @@ OnigEncodingType OnigEncodingASCII = {
   init,
   0, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/big5.c b/src/big5.c
index ff0c51b31982d9e9c0d5fc381458229d20bfc687..dbc750d850d515dce3c6ff25b5f47f933104074a 100644 (file)
--- a/src/big5.c
+++ b/src/big5.c
@@ -187,5 +187,6 @@ OnigEncodingType OnigEncodingBIG5 = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/cp1251.c b/src/cp1251.c
index f7b43c329c2b7cdfc9e035cd01105513f7511097..e2170370261ca036c86bc2819bad23ba5642763d 100644 (file)
--- a/src/cp1251.c
+++ b/src/cp1251.c
@@ -200,5 +200,6 @@ OnigEncodingType OnigEncodingCP1251 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/euc_jp.c b/src/euc_jp.c
index 8dd6ac19dbacc6286796989a88152583f7c74c25..ae8c2fe8d8913d4e62a86f381332308d7d756fcb 100644 (file)
--- a/src/euc_jp.c
+++ b/src/euc_jp.c
@@ -307,5 +307,6 @@ OnigEncodingType OnigEncodingEUC_JP = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/euc_kr.c b/src/euc_kr.c
index 08bfa1c4e307dc52d7866e63ae18eb643528243d..def311bfd5f1db8fdd833128303cb887dcdc97b4 100644 (file)
--- a/src/euc_kr.c
+++ b/src/euc_kr.c
@@ -185,5 +185,6 @@ OnigEncodingType OnigEncodingEUC_CN = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/euc_tw.c b/src/euc_tw.c
index dbf0eac1f8e3f885d47d4bde8d5961901a42ac77..87385986862e72b99787029902391260159d92e3 100644 (file)
--- a/src/euc_tw.c
+++ b/src/euc_tw.c
@@ -168,5 +168,6 @@ OnigEncodingType OnigEncodingEUC_TW = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/gb18030.c b/src/gb18030.c
index 6933129bd738091af6d9e3e8b81f47f2254f76eb..d4a11087b3a89da6093812f5e4087ba66eebc7c0 100644 (file)
--- a/src/gb18030.c
+++ b/src/gb18030.c
@@ -535,5 +535,6 @@ OnigEncodingType OnigEncodingGB18030 = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_1.c b/src/iso8859_1.c
index bcd7e26b74394d84ac503a295224145d27de58a3..ff47b807d4c70da39a8d04f53d0d50d2b0a059dd 100644 (file)
--- a/src/iso8859_1.c
+++ b/src/iso8859_1.c
@@ -272,5 +272,6 @@ OnigEncodingType OnigEncodingISO_8859_1 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_10.c b/src/iso8859_10.c
index a5946cc1a032b2c5c4b40f661c5e764dd78fc5a6..f9804e283908c0826124bd0668694a5254c4309a 100644 (file)
--- a/src/iso8859_10.c
+++ b/src/iso8859_10.c
@@ -239,5 +239,6 @@ OnigEncodingType OnigEncodingISO_8859_10 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_11.c b/src/iso8859_11.c
index ec94fd1e3e5589732624fa803640bda7113d1954..108ee8ade01055fe7c235623ff45ad467515a2c4 100644 (file)
--- a/src/iso8859_11.c
+++ b/src/iso8859_11.c
@@ -96,5 +96,6 @@ OnigEncodingType OnigEncodingISO_8859_11 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_13.c b/src/iso8859_13.c
index fba7fd4a61c03a2de321004a01d02ede24f1674f..9585355c78dbd4c14f2a3e378b3b497ff872cd80 100644 (file)
--- a/src/iso8859_13.c
+++ b/src/iso8859_13.c
@@ -228,5 +228,6 @@ OnigEncodingType OnigEncodingISO_8859_13 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_14.c b/src/iso8859_14.c
index e1f71f546be2794dc0711c2779ea9383243dd814..83fc551747a96e38815e01cae7c5c024f06cfe2e 100644 (file)
--- a/src/iso8859_14.c
+++ b/src/iso8859_14.c
@@ -241,5 +241,6 @@ OnigEncodingType OnigEncodingISO_8859_14 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_15.c b/src/iso8859_15.c
index 236e9e7128f6cb0bf5cdbb840b3022167251f50a..3a7ad0578f2fe23a2c4ba00b5a145b5d8a73c1e2 100644 (file)
--- a/src/iso8859_15.c
+++ b/src/iso8859_15.c
@@ -235,5 +235,6 @@ OnigEncodingType OnigEncodingISO_8859_15 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_16.c b/src/iso8859_16.c
index 42045bd5885356d2ea5c4eed13d3d63071c32e9f..02022d9999894c484f4075f72660c172064a609f 100644 (file)
--- a/src/iso8859_16.c
+++ b/src/iso8859_16.c
@@ -237,5 +237,6 @@ OnigEncodingType OnigEncodingISO_8859_16 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_2.c b/src/iso8859_2.c
index db93046938b2c8ddb1302897539ae1be8b042bba..ecdbb99174c668b29d1a1ed7d4aa02b0ea0efb6c 100644 (file)
--- a/src/iso8859_2.c
+++ b/src/iso8859_2.c
@@ -235,5 +235,6 @@ OnigEncodingType OnigEncodingISO_8859_2 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_3.c b/src/iso8859_3.c
index 6fe5e6f6087db2cfbae1e358ad162408b5ffd159..739f1c9b8c6528d2cafb53c28b79611995f0c3d4 100644 (file)
--- a/src/iso8859_3.c
+++ b/src/iso8859_3.c
@@ -235,5 +235,6 @@ OnigEncodingType OnigEncodingISO_8859_3 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_4.c b/src/iso8859_4.c
index ee1eb93b9bcfd8478b22863f01de94fcb2e1689f..4f2b6a029add390cc0083494c0804d1e60bc59a2 100644 (file)
--- a/src/iso8859_4.c
+++ b/src/iso8859_4.c
@@ -237,5 +237,6 @@ OnigEncodingType OnigEncodingISO_8859_4 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_5.c b/src/iso8859_5.c
index 7d828e17ff5e24c546b6649da1bd32bed5ac14c2..cf41061e03f592d72a1c6562d573e18d0d70972b 100644 (file)
--- a/src/iso8859_5.c
+++ b/src/iso8859_5.c
@@ -226,5 +226,6 @@ OnigEncodingType OnigEncodingISO_8859_5 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_6.c b/src/iso8859_6.c
index a959e98f3765189015fc84ca0a2d7a44b11f4b65..1ffe99f71a3a3ff7efb84437d37ea8c38622eeab 100644 (file)
--- a/src/iso8859_6.c
+++ b/src/iso8859_6.c
@@ -96,5 +96,6 @@ OnigEncodingType OnigEncodingISO_8859_6 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_7.c b/src/iso8859_7.c
index e6955230c406721fc466d19cf7fce339d51080d8..87288c240488ca9a8ea9f55e251ca63d3196b54c 100644 (file)
--- a/src/iso8859_7.c
+++ b/src/iso8859_7.c
@@ -222,5 +222,6 @@ OnigEncodingType OnigEncodingISO_8859_7 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_8.c b/src/iso8859_8.c
index 66b63b83a8a325bd398c788cd75bec9264497dcf..8f162a4f720dbc5ba27a50cda91a0fededd68073 100644 (file)
--- a/src/iso8859_8.c
+++ b/src/iso8859_8.c
@@ -96,5 +96,6 @@ OnigEncodingType OnigEncodingISO_8859_8 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/iso8859_9.c b/src/iso8859_9.c
index d78029360f42b98ab40e968dfc0e03343d4d4bbd..52589cf1b6b897750da038941fe200b79c9c3c7e 100644 (file)
--- a/src/iso8859_9.c
+++ b/src/iso8859_9.c
@@ -228,5 +228,6 @@ OnigEncodingType OnigEncodingISO_8859_9 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/koi8.c b/src/koi8.c
index 853182585a7dcc3a82824a8a4bf90f677e29cc11..9fb2ee5e6be2d19266564de64c98810aaf7c338b 100644 (file)
--- a/src/koi8.c
+++ b/src/koi8.c
@@ -250,5 +250,6 @@ OnigEncodingType OnigEncodingKOI8 = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/koi8_r.c b/src/koi8_r.c
index e88cfe30fba736e30f091a24c8330ba1551182ae..8adc399a911efcccf5f625f216f905bab3da71d6 100644 (file)
--- a/src/koi8_r.c
+++ b/src/koi8_r.c
@@ -212,5 +212,6 @@ OnigEncodingType OnigEncodingKOI8_R = {
   NULL, /* init */
   NULL, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/regenc.h b/src/regenc.h
index 4dd89ba18d78f44e5c2f18a73fb2a293eee7b95d..3d287860b7716baaac198ac51e858f7579efd027 100644 (file)
--- a/src/regenc.h
+++ b/src/regenc.h
@@ -120,6 +120,10 @@ struct PropertyNameCtype {
 #define ONIG_ENCODING_INIT_DEFAULT           ONIG_ENCODING_ASCII
 
 
+#define ENC_FLAG_ASCII_COMPATIBLE      (1<<0)
+#define ENC_FLAG_UNICODE               (1<<1)
+
+
 /* for encoding system implementation (internal) */
 extern int onigenc_end(void);
 extern int onigenc_ascii_apply_all_case_fold P_((OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg));

diff --git a/src/sjis.c b/src/sjis.c
index 50a1eb4faef3b479c1fb318aa3826058775192cc..12e93e88d80b372ce66a3a605c67b6eb350f92cc 100644 (file)
--- a/src/sjis.c
+++ b/src/sjis.c
@@ -338,5 +338,6 @@ OnigEncodingType OnigEncodingSJIS = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE,
+  0, 0
 };

diff --git a/src/utf16_be.c b/src/utf16_be.c
index 05a5d25fa05881b9942c46e7ebf76ed708c17d6e..8f5b8bf64b22475840d236d0004f42d130b75367 100644 (file)
--- a/src/utf16_be.c
+++ b/src/utf16_be.c
@@ -278,5 +278,6 @@ OnigEncodingType OnigEncodingUTF16_BE = {
   init,
   0, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_UNICODE,
+  0, 0
 };

diff --git a/src/utf16_le.c b/src/utf16_le.c
index 2d2e61bbaeb5452687bd9f34625a90f00de30a05..92bf3186f543f99790569cb6fef43234f751b911 100644 (file)
--- a/src/utf16_le.c
+++ b/src/utf16_le.c
@@ -286,5 +286,6 @@ OnigEncodingType OnigEncodingUTF16_LE = {
   init,
   0, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_UNICODE,
+  0, 0
 };

diff --git a/src/utf32_be.c b/src/utf32_be.c
index 93fb326885405a6d5677f331f3d8ebb2d91c7992..92476ec0331c308d017b93e6128d44c3d936a84d 100644 (file)
--- a/src/utf32_be.c
+++ b/src/utf32_be.c
@@ -191,5 +191,6 @@ OnigEncodingType OnigEncodingUTF32_BE = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_UNICODE,
+  0, 0
 };

diff --git a/src/utf32_le.c b/src/utf32_le.c
index 0cc45ede46d8f73218d1f2bff6e80af83c1ae415..dc3fd92806103a81f860e83a885cd2df2078bf9f 100644 (file)
--- a/src/utf32_le.c
+++ b/src/utf32_le.c
@@ -191,5 +191,6 @@ OnigEncodingType OnigEncodingUTF32_LE = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_UNICODE,
+  0, 0
 };

diff --git a/src/utf8.c b/src/utf8.c
index 55b571be9669aaa92af1e2af2e6582ec6a735ab7..7919e210ce5b2bf478a26c91dd013424cc3a2f71 100644 (file)
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -297,5 +297,6 @@ OnigEncodingType OnigEncodingUTF8 = {
   NULL, /* init */
   NULL, /* is_initialized */
   is_valid_mbc_string,
-  0, 0, 0
+  ENC_FLAG_ASCII_COMPATIBLE|ENC_FLAG_UNICODE,
+  0, 0
 };