diff options
54 files changed, 16470 insertions, 7827 deletions
@@ -1,3 +1,17 @@ +Fri Feb 17 15:38:53 2012 NARUSE, Yui <[email protected]> + + * Merge Onigmo-5.13.1. [ruby-dev:45057] [Feature #5820] + https://github.com/k-takata/Onigmo + cp reg{comp,enc,error,exec,parse,syntax}.c reg{enc,int,parse}.h + cp oniguruma.h + cp tool/enc-unicode.rb + cp -r enc/ + +Fri Feb 17 12:35:55 2012 NARUSE, Yui <[email protected]> + + * tool/merger.rb: remove borders from the commit message which is used + when the commit doesn't change ChangeLog. + Fri Feb 17 15:20:30 2012 Nobuyoshi Nakada <[email protected]> * enum.c (enum_each_slice): arrays to be yielded can be newly @@ -72,6 +72,9 @@ with all sufficient information, see the ChangeLog file. See above. + * Merge Onigmo. + https://github.com/k-takata/Onigmo + * incompatible changes: The :close_others option is true by default for system() and exec(). Also, the close-on-exec flag is set by default for all new file descriptors. diff --git a/enc/ascii.c b/enc/ascii.c index 3d62ec9bf7..72150c037c 100644 --- a/enc/ascii.c +++ b/enc/ascii.c @@ -1,8 +1,9 @@ /********************************************************************** - ascii.c - Oniguruma (regular expression library) + ascii.c - Onigmo (Oniguruma-mod) (regular expression library) **********************************************************************/ /*- * Copyright (c) 2002-2006 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,7 +46,9 @@ OnigEncodingDefine(ascii, ASCII) = { onigenc_ascii_is_code_ctype, onigenc_not_support_get_ctype_code_range, onigenc_single_byte_left_adjust_char_head, - onigenc_always_true_is_allowed_reverse_match + onigenc_always_true_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; ENC_ALIAS("BINARY", "ASCII-8BIT") ENC_REPLICATE("IBM437", "ASCII-8BIT") diff --git a/enc/big5.c b/enc/big5.c index c39329170e..9d7738d8f9 100644 --- a/enc/big5.c +++ b/enc/big5.c @@ -299,7 +299,9 @@ OnigEncodingDefine(big5, BIG5) = { big5_is_code_ctype, onigenc_not_support_get_ctype_code_range, big5_left_adjust_char_head, - big5_is_allowed_reverse_match + big5_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; /* @@ -331,7 +333,9 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = { big5_is_code_ctype, onigenc_not_support_get_ctype_code_range, big5_left_adjust_char_head, - big5_is_allowed_reverse_match + big5_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS") @@ -363,5 +367,7 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = { big5_is_code_ctype, onigenc_not_support_get_ctype_code_range, big5_left_adjust_char_head, - big5_is_allowed_reverse_match + big5_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; diff --git a/enc/cp949.c b/enc/cp949.c index 3eb46c976a..bf1c2637a3 100644 --- a/enc/cp949.c +++ b/enc/cp949.c @@ -210,7 +210,9 @@ OnigEncodingDefine(cp949, CP949) = { cp949_is_code_ctype, onigenc_not_support_get_ctype_code_range, cp949_left_adjust_char_head, - cp949_is_allowed_reverse_match + cp949_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; /* * Name: CP949 diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c index e75e40b168..275c8f47dc 100644 --- a/enc/emacs_mule.c +++ b/enc/emacs_mule.c @@ -334,7 +334,8 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = { onigenc_not_support_get_ctype_code_range, left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match, - 0 + 0, + ONIGENC_FLAG_NONE, }; ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule") diff --git a/enc/euc_jp.c b/enc/euc_jp.c index 7667c5800e..af21e53dd5 100644 --- a/enc/euc_jp.c +++ b/enc/euc_jp.c @@ -1,8 +1,9 @@ /********************************************************************** - euc_jp.c - Oniguruma (regular expression library) + euc_jp.c - Onigmo (Oniguruma-mod) (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +30,6 @@ #include "regint.h" - #define eucjp_islead(c) ((UChar )((c) - 0xa1) > 0xfe - 0xa1) static const int EncLen_EUCJP[] = { @@ -114,6 +114,97 @@ static const signed char trans[][0x100] = { #undef A #undef F +static const OnigPairCaseFoldCodes CaseFoldMap[] = { + /* Fullwidth Alphabet */ + { 0xa3c1, 0xa3e1 }, + { 0xa3c2, 0xa3e2 }, + { 0xa3c3, 0xa3e3 }, + { 0xa3c4, 0xa3e4 }, + { 0xa3c5, 0xa3e5 }, + { 0xa3c6, 0xa3e6 }, + { 0xa3c7, 0xa3e7 }, + { 0xa3c8, 0xa3e8 }, + { 0xa3c9, 0xa3e9 }, + { 0xa3ca, 0xa3ea }, + { 0xa3cb, 0xa3eb }, + { 0xa3cc, 0xa3ec }, + { 0xa3cd, 0xa3ed }, + { 0xa3ce, 0xa3ee }, + { 0xa3cf, 0xa3ef }, + { 0xa3d0, 0xa3f0 }, + { 0xa3d1, 0xa3f1 }, + { 0xa3d2, 0xa3f2 }, + { 0xa3d3, 0xa3f3 }, + { 0xa3d4, 0xa3f4 }, + { 0xa3d5, 0xa3f5 }, + { 0xa3d6, 0xa3f6 }, + { 0xa3d7, 0xa3f7 }, + { 0xa3d8, 0xa3f8 }, + { 0xa3d9, 0xa3f9 }, + { 0xa3da, 0xa3fa }, + + /* Greek */ + { 0xa6a1, 0xa6c1 }, + { 0xa6a2, 0xa6c2 }, + { 0xa6a3, 0xa6c3 }, + { 0xa6a4, 0xa6c4 }, + { 0xa6a5, 0xa6c5 }, + { 0xa6a6, 0xa6c6 }, + { 0xa6a7, 0xa6c7 }, + { 0xa6a8, 0xa6c8 }, + { 0xa6a9, 0xa6c9 }, + { 0xa6aa, 0xa6ca }, + { 0xa6ab, 0xa6cb }, + { 0xa6ac, 0xa6cc }, + { 0xa6ad, 0xa6cd }, + { 0xa6ae, 0xa6ce }, + { 0xa6af, 0xa6cf }, + { 0xa6b0, 0xa6d0 }, + { 0xa6b1, 0xa6d1 }, + { 0xa6b2, 0xa6d2 }, + { 0xa6b3, 0xa6d3 }, + { 0xa6b4, 0xa6d4 }, + { 0xa6b5, 0xa6d5 }, + { 0xa6b6, 0xa6d6 }, + { 0xa6b7, 0xa6d7 }, + { 0xa6b8, 0xa6d8 }, + + /* Cyrillic */ + { 0xa7a1, 0xa7d1 }, + { 0xa7a2, 0xa7d2 }, + { 0xa7a3, 0xa7d3 }, + { 0xa7a4, 0xa7d4 }, + { 0xa7a5, 0xa7d5 }, + { 0xa7a6, 0xa7d6 }, + { 0xa7a7, 0xa7d7 }, + { 0xa7a8, 0xa7d8 }, + { 0xa7a9, 0xa7d9 }, + { 0xa7aa, 0xa7da }, + { 0xa7ab, 0xa7db }, + { 0xa7ac, 0xa7dc }, + { 0xa7ad, 0xa7dd }, + { 0xa7ae, 0xa7de }, + { 0xa7af, 0xa7df }, + { 0xa7b0, 0xa7e0 }, + { 0xa7b1, 0xa7e1 }, + { 0xa7b2, 0xa7e2 }, + { 0xa7b3, 0xa7e3 }, + { 0xa7b4, 0xa7e4 }, + { 0xa7b5, 0xa7e5 }, + { 0xa7b6, 0xa7e6 }, + { 0xa7b7, 0xa7e7 }, + { 0xa7b8, 0xa7e8 }, + { 0xa7b9, 0xa7e9 }, + { 0xa7ba, 0xa7ea }, + { 0xa7bb, 0xa7eb }, + { 0xa7bc, 0xa7ec }, + { 0xa7bd, 0xa7ed }, + { 0xa7be, 0xa7ee }, + { 0xa7bf, 0xa7ef }, + { 0xa7c0, 0xa7f0 }, + { 0xa7c1, 0xa7f1 }, +}; + static int mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED) { @@ -138,7 +229,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc) int c, i, len; OnigCodePoint n; - len = enclen(enc, p, end); + len = mbc_enc_len(p, end, enc); n = (OnigCodePoint )*p++; if (len == 1) return n; @@ -154,10 +245,10 @@ static int code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED) { if (ONIGENC_IS_CODE_ASCII(code)) return 1; - else if (code > 0xffffff) - return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE; - else if (code & 0x800000) return 3; - else if (code & 0x8000) return 2; + else if (code > 0x00ffffff) + return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE; + else if ((code & 0xff808080) == 0x00808080) return 3; + else if ((code & 0xffff8080) == 0x00008080) return 2; else return ONIGERR_INVALID_CODE_POINT_VALUE; } @@ -191,10 +282,87 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc) *p++ = (UChar )(code & 0xff); #if 1 - if (enclen(enc, buf, p) != (p - buf)) + if (mbc_enc_len(buf, p, enc) != (p - buf)) return ONIGERR_INVALID_CODE_POINT_VALUE; #endif - return (int)(p - buf); + return (int )(p - buf); +} + +static int +apply_all_case_fold(OnigCaseFoldType flag, + OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc) +{ + return onigenc_apply_all_case_fold_with_map( + sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0, + flag, f, arg); +} + +static OnigCodePoint +get_lower_case(OnigCodePoint code) +{ + if (ONIGENC_IS_IN_RANGE(code, 0xa3c1, 0xa3da)) { + /* Fullwidth Alphabet */ + return (OnigCodePoint )(code + 0x0020); + } + else if (ONIGENC_IS_IN_RANGE(code, 0xa6a1, 0xa6b8)) { + /* Greek */ + return (OnigCodePoint )(code + 0x0020); + } + else if (ONIGENC_IS_IN_RANGE(code, 0xa7a1, 0xa7c1)) { + /* Cyrillic */ + return (OnigCodePoint )(code + 0x0030); + } + return code; +} + +static OnigCodePoint +get_upper_case(OnigCodePoint code) +{ + if (ONIGENC_IS_IN_RANGE(code, 0xa3e1, 0xa3fa)) { + /* Fullwidth Alphabet */ + return (OnigCodePoint )(code - 0x0020); + } + else if (ONIGENC_IS_IN_RANGE(code, 0xa6c1, 0xa6d8)) { + /* Greek */ + return (OnigCodePoint )(code - 0x0020); + } + else if (ONIGENC_IS_IN_RANGE(code, 0xa7d1, 0xa7f1)) { + /* Cyrillic */ + return (OnigCodePoint )(code - 0x0030); + } + return code; +} + +static int +get_case_fold_codes_by_str(OnigCaseFoldType flag, + const OnigUChar* p, const OnigUChar* end, + OnigCaseFoldCodeItem items[], OnigEncoding enc) +{ + int len; + OnigCodePoint code, code_lo, code_up; + + code = mbc_to_code(p, end, enc); + if (ONIGENC_IS_ASCII_CODE(code)) + return onigenc_ascii_get_case_fold_codes_by_str(flag, p, end, items, enc); + + len = mbc_enc_len(p, end, enc); + code_lo = get_lower_case(code); + code_up = get_upper_case(code); + + if (code != code_lo) { + items[0].byte_len = len; + items[0].code_len = 1; + items[0].code[0] = code_lo; + return 1; + } + else if (code != code_up) { + items[0].byte_len = len; + items[0].code_len = 1; + items[0].code[0] = code_up; + return 1; + } + + return 0; } static int @@ -202,7 +370,6 @@ mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* lower, OnigEncoding enc) { - int len; const UChar* p = *pp; if (ONIGENC_IS_MBC_ASCII(p)) { @@ -211,12 +378,11 @@ mbc_case_fold(OnigCaseFoldType flag, return 1; } else { - int i; + OnigCodePoint code; + int len; - len = enclen(enc, p, end); - for (i = 0; i < len; i++) { - *lower++ = *p++; - } + code = get_lower_case(mbc_to_code(p, end, enc)); + len = code_to_mbc(code, lower, enc); (*pp) += len; return len; /* return byte length of converted char to lower */ } @@ -235,7 +401,7 @@ left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, Onig p = s; while (!eucjp_islead(*p) && p > start) p--; - len = enclen(enc, p, end); + len = mbc_enc_len(p, end, enc); if (p + len > s) return (UChar* )p; p += len; return (UChar* )(p + ((s - p) & ~1)); @@ -260,15 +426,83 @@ static hash_table_type* PropertyNameTable; static const OnigCodePoint CR_Hiragana[] = { 1, +#ifdef ENC_EUC_JIS_2004 + 0xa4a1, 0xa4fb +#else 0xa4a1, 0xa4f3 +#endif }; /* CR_Hiragana */ +#ifdef ENC_EUC_JIS_2004 +static const OnigCodePoint CR_Katakana[] = { + 5, + 0x8ea6, 0x8eaf, /* JIS X 0201 Katakana */ + 0x8eb1, 0x8edd, /* JIS X 0201 Katakana */ + 0xa5a1, 0xa5fe, + 0xa6ee, 0xa6fe, + 0xa7f2, 0xa7f5, +}; /* CR_Katakana */ +#else static const OnigCodePoint CR_Katakana[] = { 3, + 0x8ea6, 0x8eaf, /* JIS X 0201 Katakana */ + 0x8eb1, 0x8edd, /* JIS X 0201 Katakana */ 0xa5a1, 0xa5f6, - 0xaaa6, 0xaaaf, - 0xaab1, 0xaadd }; /* CR_Katakana */ +#endif + +#ifdef ENC_EUC_JIS_2004 +static const OnigCodePoint CR_Han[] = { + /* EUC-JIS-2004 (JIS X 0213:2004) */ + 7, + /* plane 1 */ + 0xa1b8, 0xa1b8, + 0xaea1, 0xfefe, /* Kanji level 1, 2 and 3 */ + /* plane 2 */ + 0x8fa1a1, 0x8fa1fe, /* row 1 */ + 0x8fa3a1, 0x8fa5fe, /* row 3 .. 5 */ + 0x8fa8a1, 0x8fa8fe, /* row 8 */ + 0x8faca1, 0x8faffe, /* row 12 .. 15 */ + 0x8feea1, 0x8ffef6, /* row 78 .. 94 */ +}; /* CR_Han */ +#else +static const OnigCodePoint CR_Han[] = { + /* EUC-JP (JIS X 0208 based) */ + 4, + 0xa1b8, 0xa1b8, + 0xb0a1, 0xcfd3, /* Kanji level 1 */ + 0xd0a1, 0xf4a6, /* Kanji level 2 */ + 0x8fb0a1, 0x8fedf3 /* JIS X 0212 Supplemental Kanji (row 16 .. 77) */ +}; /* CR_Han */ +#endif + +static const OnigCodePoint CR_Latin[] = { + 4, + 0x0041, 0x005a, + 0x0061, 0x007a, + 0xa3c1, 0xa3da, + 0xa3e1, 0xa3fa, + /* TODO: add raw 8 .. 11 to support EUC-JIS-2004 */ + /* TODO: add JIS X 0212 row 9 .. 11 */ +}; /* CR_Latin */ + +static const OnigCodePoint CR_Greek[] = { + 2, + 0xa6a1, 0xa6b8, +#ifdef ENC_EUC_JIS_2004 + 0xa6c1, 0xa6d9, +#else + 0xa6c1, 0xa6d8, + /* TODO: add JIS X 0212 row 6 */ +#endif +}; /* CR_Greek */ + +static const OnigCodePoint CR_Cyrillic[] = { + 2, + 0xa7a1, 0xa7c1, + 0xa7d1, 0xa7f1, + /* TODO: add JIS X 0212 row 7 */ +}; /* CR_Cyrillic */ static int init_property_list(void) @@ -277,6 +511,10 @@ init_property_list(void) PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana); PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana); + PROPERTY_LIST_ADD_PROP("han", CR_Han); + PROPERTY_LIST_ADD_PROP("latin", CR_Latin); + PROPERTY_LIST_ADD_PROP("greek", CR_Greek); + PROPERTY_LIST_ADD_PROP("cyrillic", CR_Cyrillic); PropertyInited = 1; end: @@ -300,7 +538,7 @@ property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) return onigenc_minimum_property_name_to_ctype(enc, s, e); } - return (int)ctype; + return (int )ctype; } static int @@ -360,14 +598,15 @@ OnigEncodingDefine(euc_jp, EUC_JP) = { code_to_mbclen, code_to_mbc, mbc_case_fold, - onigenc_ascii_apply_all_case_fold, - onigenc_ascii_get_case_fold_codes_by_str, + apply_all_case_fold, + get_case_fold_codes_by_str, property_name_to_ctype, is_code_ctype, get_ctype_code_range, left_adjust_char_head, is_allowed_reverse_match, - 0 + 0, + ONIGENC_FLAG_NONE, }; /* * Name: EUC-JP diff --git a/enc/euc_kr.c b/enc/euc_kr.c index af5f7828f0..55acf00168 100644 --- a/enc/euc_kr.c +++ b/enc/euc_kr.c @@ -187,6 +187,8 @@ OnigEncodingDefine(euc_kr, EUC_KR) = { euckr_is_code_ctype, onigenc_not_support_get_ctype_code_range, euckr_left_adjust_char_head, - euckr_is_allowed_reverse_match + euckr_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; ENC_ALIAS("eucKR", "EUC-KR") diff --git a/enc/euc_tw.c b/enc/euc_tw.c index 5fed8a893d..6d193b745e 100644 --- a/enc/euc_tw.c +++ b/enc/euc_tw.c @@ -220,6 +220,8 @@ OnigEncodingDefine(euc_tw, EUC_TW) = { euctw_is_code_ctype, onigenc_not_support_get_ctype_code_range, euctw_left_adjust_char_head, - euctw_is_allowed_reverse_match + euctw_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; ENC_ALIAS("eucTW", "EUC-TW") diff --git a/enc/gb18030.c b/enc/gb18030.c index 36e60af6b5..d4184333f5 100644 --- a/enc/gb18030.c +++ b/enc/gb18030.c @@ -596,6 +596,8 @@ OnigEncodingDefine(gb18030, GB18030) = { gb18030_is_code_ctype, onigenc_not_support_get_ctype_code_range, gb18030_left_adjust_char_head, - gb18030_is_allowed_reverse_match + gb18030_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; @@ -210,7 +210,9 @@ OnigEncodingDefine(gbk, GBK) = { gbk_is_code_ctype, onigenc_not_support_get_ctype_code_range, gbk_left_adjust_char_head, - gbk_is_allowed_reverse_match + gbk_is_allowed_reverse_match, + 0, + ONIGENC_FLAG_NONE, }; /* * Name: GBK diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c index a10a7679b8..92dc14f978 100644 --- a/enc/iso_8859_1.c +++ b/ |