refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 7a26b7e680018860e99c4d4df83e92d487e540e8..dcb75e1f62467cb78a7094be8b4107276dd8cafc 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1640,7 +1640,7 @@ compile_anchor_node(AnchorNode* node, regex_t* reg, ScanEnv* env)
     break;
 
   case ANCHOR_NO_WORD_BOUNDARY:
-    op = OP_NO_WORD_BOUND; goto word;
+    op = OP_NO_WORD_BOUNDARY; goto word;
     break;
 #ifdef USE_WORD_BEGIN_END
   case ANCHOR_WORD_BEGIN:
@@ -6730,7 +6730,7 @@ OnigOpInfoType OnigOpInfo[] = {
   { OP_NO_WORD,             "not-word",        ARG_NON },
   { OP_NO_WORD_ASCII,       "not-word-ascii",  ARG_NON },
   { OP_WORD_BOUNDARY,       "word-boundary",     ARG_MODE },
-  { OP_NO_WORD_BOUND,       "not-word-boundary", ARG_MODE },
+  { OP_NO_WORD_BOUNDARY,    "not-word-boundary", ARG_MODE },
   { OP_WORD_BEGIN,          "word-begin",      ARG_MODE },
   { OP_WORD_END,            "word-end",        ARG_MODE },
   { OP_BEGIN_BUF,           "begin-buf",       ARG_NON },

diff --git a/src/regexec.c b/src/regexec.c
index 1c1203da3bde15c12c31cf8eb07a2a957f1ff2b9..341c84a1ec6e3e30666d76c51702f64c3ffc0063 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -2208,7 +2208,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       continue;
       break;
 
-    case OP_NO_WORD_BOUND:  MOP_IN(OP_NO_WORD_BOUND);
+    case OP_NO_WORD_BOUNDARY:  MOP_IN(OP_NO_WORD_BOUNDARY);
       {
         ModeType mode;
         GET_MODE_INC(mode, p); // ascii_mode

diff --git a/src/regint.h b/src/regint.h
index 2bde4e5507afe2f1b3cb4f6ce6b989e7d61d13f3..2abd58be2bf2859118616d6066d2229adaf812a9 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -516,7 +516,7 @@ enum OpCode {
   OP_NO_WORD,
   OP_NO_WORD_ASCII,
   OP_WORD_BOUNDARY,
-  OP_NO_WORD_BOUND,
+  OP_NO_WORD_BOUNDARY,
   OP_WORD_BEGIN,
   OP_WORD_END,