refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 89f9255073f10fd4961c7c3a9e74999a8c64d3ea..d0dde1c1fc46325a134db4dc754d6dc1799e6919 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1656,7 +1656,7 @@ compile_anchor_node(AnchorNode* node, regex_t* reg, ScanEnv* env)
     break;
 
   case ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
-    r = add_opcode(reg, OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND);
+    r = add_opcode(reg, OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY);
     break;
 
   case ANCHOR_PREC_READ:

diff --git a/src/regexec.c b/src/regexec.c
index e5dfb156dd5c0af1b611322bbdfc25217e6547f2..9dbef70778f304d90c6a0ee0612bbcc4ea9e7bcb 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -2273,8 +2273,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       goto fail;
       break;
 
-    case OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND:
-      MOP_IN(OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND);
+    case OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
+      MOP_IN(OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY);
       if (onigenc_egcb_is_break_position(encode, s, sprev, str, end))
         goto fail;
 

diff --git a/src/regint.h b/src/regint.h
index 575c19b258ca21e4f13273352842dd0349e0d8b6..9dc1723e2fbe098864838e03286f20b954306c4e 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -521,7 +521,7 @@ enum OpCode {
   OP_WORD_END,
 
   OP_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY,
-  OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND,
+  OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY,
 
   OP_BEGIN_BUF,
   OP_END_BUF,