* grapheme cluster implementation reverted. [ruby-dev:36375]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 14 deletions

diff --git a/regenc.c b/regenc.c
index f25bc80ad8..634afd8883 100644
--- a/regenc.c
+++ b/regenc.c
@@ -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;