]> granicus.if.org Git - onig/commitdiff
disable OP_CCLASS_NODE
authorK.Kosako <kkosako0@gmail.com>
Fri, 11 Aug 2017 04:45:48 +0000 (13:45 +0900)
committerK.Kosako <kkosako0@gmail.com>
Fri, 11 Aug 2017 04:45:48 +0000 (13:45 +0900)
src/regcomp.c
src/regexec.c
src/regint.h

index 4b4f55687d8b7c209ddcb78ed98d9c9e7b35dbf9..f348f1546977846cb3994ec3cae7afa45906517a 100644 (file)
@@ -6652,7 +6652,9 @@ OnigOpInfoType OnigOpInfo[] = {
   { OP_CCLASS_NOT,        "cclass-not",      ARG_SPECIAL },
   { OP_CCLASS_MB_NOT,     "cclass-mb-not",   ARG_SPECIAL },
   { OP_CCLASS_MIX_NOT,    "cclass-mix-not",  ARG_SPECIAL },
+#ifdef USE_OP_CCLASS_NODE
   { OP_CCLASS_NODE,       "cclass-node",     ARG_SPECIAL },
+#endif
   { OP_ANYCHAR,           "anychar",         ARG_NON },
   { OP_ANYCHAR_ML,        "anychar-ml",      ARG_NON },
   { OP_ANYCHAR_STAR,      "anychar*",        ARG_NON },
@@ -6925,6 +6927,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp, UChar* start,
       fprintf(f, ":%d:%d:%d", n, (int )code, len);
       break;
 
+#ifdef USE_OP_CCLASS_NODE
     case OP_CCLASS_NODE:
       {
         CClassNode *cc;
@@ -6934,6 +6937,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp, UChar* start,
         fprintf(f, ":%p:%d", cc, n);
       }
       break;
+#endif
 
     case OP_BACKREF_N_IC:
       mem = *((MemNumType* )bp);
index e7dfb967e27383651f8d3668e1aaf96927c1f64d..eaa56fa2861e944d0f06a9c4fec3bc6b48640f37 100644 (file)
@@ -2002,6 +2002,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       MOP_OUT;
       break;
 
+#ifdef USE_OP_CCLASS_NODE
     case OP_CCLASS_NODE:  MOP_IN(OP_CCLASS_NODE);
       {
         OnigCodePoint code;
@@ -2020,6 +2021,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       }
       MOP_OUT;
       break;
+#endif
 
     case OP_ANYCHAR:  MOP_IN(OP_ANYCHAR);
       DATA_ENSURE(1);
index 0be0ac08adfacc9176e8dab9cb4abed289748d57..beadfa346865683435aad6ae28dc0f74a91e76f6 100644 (file)
@@ -479,7 +479,9 @@ 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 */