From: K.Kosako <kkosako0@gmail.com>
Date: Fri, 15 Feb 2019 12:43:43 +0000 (+0900)
Subject: remove USE_OP_CCLASS_NODE
X-Git-Tag: v6.9.2_rc1~65^2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=487085edc37d3d68db2226e41d5190030ffa9f07;p=onig

remove USE_OP_CCLASS_NODE
---

diff --git a/src/regexec.c b/src/regexec.c
index 67b2748..af5ac7b 100644
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -172,9 +172,6 @@ static OpInfoType OpInfo[] = {
   { OP_CCLASS_NOT,        "cclass-not"  },
   { OP_CCLASS_MB_NOT,     "cclass-mb-not"  },
   { OP_CCLASS_MIX_NOT,    "cclass-mix-not" },
-#ifdef USE_OP_CCLASS_NODE
-  { OP_CCLASS_NODE,       "cclass-node" },
-#endif
   { OP_ANYCHAR,               "anychar"     },
   { OP_ANYCHAR_ML,            "anychar-ml"  },
   { OP_ANYCHAR_STAR,          "anychar*"    },
@@ -2473,9 +2470,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
   &&L_CCLASS_NOT,
   &&L_CCLASS_MB_NOT,
   &&L_CCLASS_MIX_NOT,
-#ifdef USE_OP_CCLASS_NODE
-  &&L_CCLASS_NODE,
-#endif
   &&L_ANYCHAR,
   &&L_ANYCHAR_ML,
   &&L_ANYCHAR_STAR,
@@ -3043,27 +3037,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       INC_OP;
       NEXT_OUT;
 
-#ifdef USE_OP_CCLASS_NODE
-    CASE_OP(CCLASS_NODE)
-      {
-        OnigCodePoint code;
-        void *node;
-        int mb_len;
-        UChar *ss;
-
-        DATA_ENSURE(1);
-        GET_POINTER_INC(node, p);
-        mb_len = enclen(encode, s);
-        ss = s;
-        s += mb_len;
-        DATA_ENSURE(0);
-        code = ONIGENC_MBC_TO_CODE(encode, ss, s);
-        if (onig_is_code_in_cc_len(mb_len, code, node) == 0) goto fail;
-      }
-      INC_OP;
-      NEXT_OUT;
-#endif
-
     CASE_OP(ANYCHAR)
       DATA_ENSURE(1);
       n = enclen(encode, s);
diff --git a/src/regint.h b/src/regint.h
index 9875e95..7b506b6 100644
--- a/src/regint.h
+++ b/src/regint.h
@@ -515,9 +515,6 @@ enum OpCode {
   OP_CCLASS_NOT,
   OP_CCLASS_MB_NOT,
   OP_CCLASS_MIX_NOT,
-#ifdef USE_OP_CCLASS_NODE
-  OP_CCLASS_NODE,       /* pointer to CClassNode node */
-#endif
 
   OP_ANYCHAR,                 /* "."  */
   OP_ANYCHAR_ML,              /* "."  multi-line */