diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-18 12:53:25 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-18 12:53:25 +0000 |
commit | 081c802cb9fe84d349bc4ecf26a36eceae431aed (patch) | |
tree | 4e0e385b4fd86fd99da61032af2c40db7edf5f76 /regenc.c | |
parent | 22987dc7fe5830d8423f8153bef0310339e178f4 (diff) | |
download | bundler-081c802cb9fe84d349bc4ecf26a36eceae431aed.tar.gz |
* grapheme cluster implementation reverted. [ruby-dev:36375]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regenc.c')
-rw-r--r-- | regenc.c | 17 |
1 files changed, 3 insertions, 14 deletions
@@ -615,11 +615,8 @@ onigenc_single_byte_mbc_enc_len(const UChar* p ARG_UNUSED, const UChar* e ARG_UN extern OnigCodePoint onigenc_single_byte_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED, - int *precise_ret, OnigEncoding enc ARG_UNUSED) { - if (precise_ret) - *precise_ret = ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1); return (OnigCodePoint )(*p); } @@ -671,20 +668,12 @@ onigenc_ascii_is_code_ctype(OnigCodePoint code, unsigned int ctype, } extern OnigCodePoint -onigenc_mbn_mbc_to_code(OnigEncoding enc, const UChar* p, const UChar* end, int *precise_ret) +onigenc_mbn_mbc_to_code(OnigEncoding enc, const UChar* p, const UChar* end) { - int c, i, len, ret; + int c, i, len; OnigCodePoint n; - ret = ONIGENC_PRECISE_MBC_ENC_LEN(enc, p, end); - if (precise_ret) - *precise_ret = ret; - if (ONIGENC_MBCLEN_CHARFOUND_P(ret)) - len = ONIGENC_MBCLEN_CHARFOUND_LEN(ret); - else if (ONIGENC_MBCLEN_NEEDMORE_P(ret)) - len = end-p+ONIGENC_MBCLEN_NEEDMORE_LEN(ret); - else - len = 1; + len = enclen(enc, p, end); n = (OnigCodePoint )(*p++); if (len == 1) return n; |