refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 8fe8639d90f51e288df825d81f6e9d9a38430401..72b6ba28f746bf380bf12ced7e26f77c75dfd850 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1604,7 +1604,7 @@ compile_length_anchor_node(AnchorNode* node, regex_t* reg)
     len = SIZE_OP_WORD_BOUND;
     break;
 
-  case ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUND:
+  case ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
   case ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND:
     len = SIZE_OPCODE;
     break;
@@ -1651,7 +1651,7 @@ compile_anchor_node(AnchorNode* node, regex_t* reg, ScanEnv* env)
     break;
 #endif
 
-  case ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUND:
+  case ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
     r = add_opcode(reg, OP_EXTENDED_GRAPHEME_CLUSTER_BOUND);
     break;
 
@@ -4632,14 +4632,14 @@ setup_anchor(Node* node, regex_t* reg, int state, ScanEnv* env)
   ( ANCHOR_LOOK_BEHIND | ANCHOR_BEGIN_LINE | ANCHOR_END_LINE | ANCHOR_BEGIN_BUF \
   | ANCHOR_BEGIN_POSITION | ANCHOR_WORD_BOUNDARY | ANCHOR_NO_WORD_BOUNDARY \
   | ANCHOR_WORD_BEGIN | ANCHOR_WORD_END \
-  | ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUND \
+  | ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY \
   | ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND )
 
 #define ALLOWED_ANCHOR_IN_LB_NOT \
   ( ANCHOR_LOOK_BEHIND | ANCHOR_LOOK_BEHIND_NOT | ANCHOR_BEGIN_LINE \
   | ANCHOR_END_LINE | ANCHOR_BEGIN_BUF | ANCHOR_BEGIN_POSITION | ANCHOR_WORD_BOUNDARY \
   | ANCHOR_NO_WORD_BOUNDARY | ANCHOR_WORD_BEGIN | ANCHOR_WORD_END \
-  | ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUND \
+  | ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY \
   | ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND )
 
   int r;
@@ -7251,10 +7251,10 @@ print_indent_tree(FILE* f, Node* node, int indent)
     case ANCHOR_WORD_BEGIN:       fputs("word begin", f);     break;
     case ANCHOR_WORD_END:         fputs("word end", f);       break;
 #endif
-    case ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUND:
-      fputs("extended-grapheme-cluster bound", f); break;
+    case ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
+      fputs("extended-grapheme-cluster boundary", f); break;
     case ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND:
-      fputs("no-extended-grapheme-cluster bound", f); break;
+      fputs("no-extended-grapheme-cluster boundary", f); break;
     case ANCHOR_PREC_READ:
       fprintf(f, "prec read\n");
       print_indent_tree(f, NODE_BODY(node), indent + add);

diff --git a/src/regint.h b/src/regint.h
index 28d0f531cdd05bade4d6d25ec98292fe6c0bb90f..169539598bff2ccde66c74d979dbccfec1b5af8e 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -463,7 +463,7 @@ typedef struct _BBuf {
 #define ANCHOR_WORD_END         (1<<13)
 #define ANCHOR_ANYCHAR_STAR     (1<<14)   /* ".*" optimize info */
 #define ANCHOR_ANYCHAR_STAR_ML  (1<<15)   /* ".*" optimize info (multi-line) */
-#define ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUND       (1<<16)
+#define ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY    (1<<16)
 #define ANCHOR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUND    (1<<17)
 
 

diff --git a/src/regparse.c b/src/regparse.c
index 6cbce5ef063ec1102a778ee3b9d0fc3ac9b1ae1f..faff0f18e471ea48640d6c75e9b27ede68a20c26 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -3940,7 +3940,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
     case 'y':
       if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP2_ESC_X_Y_GRAPHEME_CLUSTER)) break;
       tok->type = TK_ANCHOR;
-      tok->u.anchor = ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUND;
+      tok->u.anchor = ANCHOR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY;
       break;
 
     case 'Y':