ruby-changes:3577
From: ko1@a...
Date: Tue, 15 Jan 2008 18:48:26 +0900 (JST)
Subject: [ruby-changes:3577] matz - Ruby:r15066 (trunk): * enc/utf_8.c: remove use of ONIG_ENCODING_UTF8 altogether; use
matz 2008-01-15 18:47:58 +0900 (Tue, 15 Jan 2008) New Revision: 15066 Modified files: trunk/ChangeLog trunk/enc/utf_8.c Log: * enc/utf_8.c: remove use of ONIG_ENCODING_UTF8 altogether; use enc argument instead. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15066&r2=15065&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/utf_8.c?r1=15066&r2=15065&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 15065) +++ ChangeLog (revision 15066) @@ -1,3 +1,8 @@ +Tue Jan 15 18:44:46 2008 Yukihiro Matsumoto <matz@r...> + + * enc/utf_8.c: remove use of ONIG_ENCODING_UTF8 altogether; use + enc argument instead. + Tue Jan 15 18:05:26 2008 NAKAMURA Usaku <usa@r...> * enc/utf_8.c (ONIG_ENCODING_UTF8): reverted. Index: enc/utf_8.c =================================================================== --- enc/utf_8.c (revision 15065) +++ enc/utf_8.c (revision 15066) @@ -272,7 +272,7 @@ int c, len; OnigCodePoint n; - len = enclen(ONIG_ENCODING_UTF8, p, end); + len = enclen(enc, p, end); c = *p++; if (len > 1) { len--; @@ -390,48 +390,11 @@ return 1; /* return byte length of converted char to lower */ } else { - return onigenc_unicode_mbc_case_fold(ONIG_ENCODING_UTF8, flag, - pp, end, fold); + return onigenc_unicode_mbc_case_fold(enc, flag, pp, end, fold); } } -#if 0 -static int -is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end) -{ - const UChar* p = *pp; - if (ONIGENC_IS_MBC_ASCII(p)) { - (*pp)++; - return ONIGENC_IS_ASCII_CODE_CASE_AMBIG(*p); - } - else { - (*pp) += enclen(ONIG_ENCODING_UTF8, p); - - if (*p == 0xc3) { - int c = *(p + 1); - if (c >= 0x80) { - if (c <= (UChar )0x9e) { /* upper */ - if (c == (UChar )0x97) return FALSE; - return TRUE; - } - else if (c >= (UChar )0xa0 && c <= (UChar )0xbe) { /* lower */ - if (c == (UChar )'\267') return FALSE; - return TRUE; - } - else if (c == (UChar )0x9f && - (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) { - return TRUE; - } - } - } - } - - return FALSE; -} -#endif - - static int get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out, const OnigCodePoint* ranges[], OnigEncoding enc) @@ -458,8 +421,7 @@ const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc) { - return onigenc_unicode_get_case_fold_codes_by_str(ONIG_ENCODING_UTF8, - flag, p, end, items); + return onigenc_unicode_get_case_fold_codes_by_str(enc, flag, p, end, items); } OnigEncodingDefine(utf8, UTF8) = { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/