diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-04 00:51:22 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-04 00:51:22 +0000 |
| commit | 8c658137d9d4ae409bcf3f76b738392145c21401 () | |
| tree | 279f6d6764f167b5a380f2b52edc80cfddee941d | |
| parent | b3d7273dc1f7e29a759de8dd88cd00f99a66bed1 (diff) | |
More strict for Big5 series.
* enc/big5.c (EncLen_Big5): back to original Big5 table. (EncLen_Big5_HKSCS): for Big5-HKSCS. (trans): add the lead byte table for Big5-HKSCS. (big5_mbc_enc_len): abstract function for Big5 series. (big5_mbc_enc_len): for Big5. (big5_hkscs_mbc_enc_len): for Big5-HKSCS. (BIG5_HKSCS_P): added. (BIG5_ISMB_FIRST): add routine for Big5-HKSCS. (big5_hkscs): add for Big5-HKSCS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | enc/big5.c | 79 |
2 files changed, 86 insertions, 5 deletions
@@ -1,3 +1,15 @@ Tue Aug 4 09:33:54 2009 NARUSE, Yui <[email protected]> * encoding.c (rb_enc_set_base): Add for setting base encoding @@ -30,6 +30,24 @@ #include "regenc.h" static const int EncLen_BIG5[] = { /* LEN 0 1 2 3 4 5 6 7 8 9 A B C D E F */ /* 0 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 1 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -88,26 +106,56 @@ static const signed char trans[][0x100] = { /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F } }; #undef A #undef F static int -big5_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED) { int firstbyte = *p++; - state_t s = trans[0][firstbyte]; #define RETURN(n) \ return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \ ONIGENC_CONSTRUCT_MBCLEN_INVALID() if (s < 0) RETURN(1); - if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_BIG5[firstbyte]-1); s = trans[s][*p++]; RETURN(2); #undef RETURN } static OnigCodePoint big5_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) { @@ -162,7 +210,11 @@ static const char BIG5_CAN_BE_TRAIL_TABLE[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 }; -#define BIG5_ISMB_FIRST(byte) (EncLen_BIG5[byte] > 1) #define BIG5_ISMB_TRAIL(byte) BIG5_CAN_BE_TRAIL_TABLE[(byte)] static UChar* @@ -229,5 +281,22 @@ ENC_ALIAS("CP950", "Big5") * Source: See (http://www.iana.org/assignments/charset-reg/Big5-HKSCS) * Alias: None */ -ENC_REPLICATE("Big5-HKSCS", "Big5") ENC_ALIAS("CP951", "Big5-HKSCS") |