refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index dcb75e1f62467cb78a7094be8b4107276dd8cafc..89f9255073f10fd4961c7c3a9e74999a8c64d3ea 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1652,7 +1652,7 @@ compile_anchor_node(AnchorNode* node, regex_t* reg, ScanEnv* env)
 #endif
 
   case ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
-    r = add_opcode(reg, OP_EXTENDED_GRAPHEME_CLUSTER_BOUND);
+    r = add_opcode(reg, OP_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY);
     break;
 
   case ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:

diff --git a/src/regexec.c b/src/regexec.c
index 341c84a1ec6e3e30666d76c51702f64c3ffc0063..e5dfb156dd5c0af1b611322bbdfc25217e6547f2 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -2264,8 +2264,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       break;
 #endif
 
-    case OP_EXTENDED_GRAPHEME_CLUSTER_BOUND:
-      MOP_IN(OP_EXTENDED_GRAPHEME_CLUSTER_BOUND);
+    case OP_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
+      MOP_IN(OP_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY);
       if (onigenc_egcb_is_break_position(encode, s, sprev, str, end)) {
         MOP_OUT;
         continue;

diff --git a/src/regint.h b/src/regint.h
index 2abd58be2bf2859118616d6066d2229adaf812a9..575c19b258ca21e4f13273352842dd0349e0d8b6 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -520,7 +520,7 @@ enum OpCode {
   OP_WORD_BEGIN,
   OP_WORD_END,
 
-  OP_EXTENDED_GRAPHEME_CLUSTER_BOUND,
+  OP_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY,
   OP_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND,
 
   OP_BEGIN_BUF,