don't use enclen_end() by check in onig_parse_make_tree()

diff --git a/src/regparse.c b/src/regparse.c
index b0e0bca06d87e87a60f19ff5d78d5ed9c02edf26..7df9c35986d39acffe5b78d6f765b484e16dc891 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -277,20 +277,20 @@ strdup_with_null(OnigEncoding enc, UChar* s, UChar* end)
 #define PUNFETCH     p = pfetch_prev
 #define PINC       do { \
   pfetch_prev = p; \
-  p += ONIGENC_MBC_ENC_LEN_END(enc, p, end); \
+  p += ONIGENC_MBC_ENC_LEN(enc, p); \
 } while (0)
 #define PFETCH(c)  do { \
   c = ONIGENC_MBC_TO_CODE(enc, p, end); \
   pfetch_prev = p; \
-  p += ONIGENC_MBC_ENC_LEN_END(enc, p, end); \
+  p += ONIGENC_MBC_ENC_LEN(enc, p); \
 } while (0)
 
 #define PINC_S     do { \
-  p += ONIGENC_MBC_ENC_LEN_END(enc, p, end); \
+  p += ONIGENC_MBC_ENC_LEN(enc, p); \
 } while (0)
 #define PFETCH_S(c) do { \
   c = ONIGENC_MBC_TO_CODE(enc, p, end); \
-  p += ONIGENC_MBC_ENC_LEN_END(enc, p, end); \
+  p += ONIGENC_MBC_ENC_LEN(enc, p); \
 } while (0)
 
 #define PPEEK        (p < end ? ONIGENC_MBC_TO_CODE(enc, p, end) : PEND_VALUE)
@@ -1480,7 +1480,7 @@ static int
 str_node_can_be_split(StrNode* sn, OnigEncoding enc)
 {
   if (sn->end > sn->s) {
-    return ((enclen_end(enc, sn->s, sn->end) < sn->end - sn->s)  ?  1 : 0);
+    return ((enclen(enc, sn->s) < sn->end - sn->s)  ?  1 : 0);
   }
   return 0;
 }
@@ -2767,12 +2767,12 @@ find_str_position(OnigCodePoint s[], int n, UChar* from, UChar* to,
   
   while (p < to) {
     x = ONIGENC_MBC_TO_CODE(enc, p, to);
-    q = p + enclen_end(enc, p, to);
+    q = p + enclen(enc, p);
     if (x == s[0]) {
       for (i = 1; i < n && q < to; i++) {
         x = ONIGENC_MBC_TO_CODE(enc, q, to);
         if (x != s[i]) break;
-        q += enclen_end(enc, q, to);
+        q += enclen(enc, q);
       }
       if (i >= n) {
         if (IS_NOT_NULL(next))
@@ -2798,19 +2798,19 @@ str_exist_check_with_esc(OnigCodePoint s[], int n, UChar* from, UChar* to,
   while (p < to) {
     if (in_esc) {
       in_esc = 0;
-      p += enclen_end(enc, p, to);
+      p += enclen(enc, p);
     }
     else {
       x = ONIGENC_MBC_TO_CODE(enc, p, to);
-      q = p + enclen_end(enc, p, to);
+      q = p + enclen(enc, p);
       if (x == s[0]) {
         for (i = 1; i < n && q < to; i++) {
           x = ONIGENC_MBC_TO_CODE(enc, q, to);
           if (x != s[i]) break;
-          q += enclen_end(enc, q, to);
+          q += enclen(enc, q);
         }
         if (i >= n) return 1;
-        p += enclen_end(enc, p, to);
+        p += enclen(enc, p);
       }
       else {
         x = ONIGENC_MBC_TO_CODE(enc, p, to);
@@ -2938,7 +2938,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
             return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
         }
 
-        if (p > prev + enclen_end(enc, prev, end) && !PEND && (PPEEK_IS('}'))) {
+        if (p > prev + enclen(enc, prev) && !PEND && (PPEEK_IS('}'))) {
           PINC;
           tok->type   = TK_CODE_POINT;
           tok->base   = 16;
@@ -3278,7 +3278,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
             return ONIGERR_TOO_LONG_WIDE_CHAR_VALUE;
         }
 
-        if ((p > prev + enclen_end(enc, prev, end)) && !PEND && PPEEK_IS('}')) {
+        if ((p > prev + enclen(enc, prev)) && !PEND && PPEEK_IS('}')) {
           PINC;
           tok->type   = TK_CODE_POINT;
           tok->u.code = (OnigCodePoint )num;
@@ -3499,7 +3499,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
         tok->u.code = (OnigCodePoint )num;
       }
       else { /* string */
-        p = tok->backp + enclen_end(enc, tok->backp, end);
+        p = tok->backp + enclen(enc, tok->backp);
       }
       break;
     }