refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index cc6eaa259fd50216eb6c31fde00b137808671fc5..dfba57b8562882cd7ecd2aeb2b77e009c1bcc10e 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1519,8 +1519,8 @@ compile_length_anchor_node(AnchorNode* node, regex_t* reg)
     len = SIZE_OP_WORD_BOUNDARY;
     break;
 
-  case ANCR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
-  case ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
+  case ANCR_TEXT_SEGMENT_BOUNDARY:
+  case ANCR_NO_TEXT_SEGMENT_BOUNDARY:
     len = SIZE_OPCODE;
     break;
 
@@ -1566,12 +1566,12 @@ compile_anchor_node(AnchorNode* node, regex_t* reg, ScanEnv* env)
     break;
 #endif
 
-  case ANCR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
-  case ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
+  case ANCR_TEXT_SEGMENT_BOUNDARY:
+  case ANCR_NO_TEXT_SEGMENT_BOUNDARY:
     r = add_op(reg, OP_TEXT_SEGMENT_BOUNDARY);
     if (r != 0) return r;
     COP(reg)->text_segment_boundary.not =
-      (node->type == ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY ? 1 : 0);
+      (node->type == ANCR_NO_TEXT_SEGMENT_BOUNDARY ? 1 : 0);
     break;
 
   case ANCR_PREC_READ:
@@ -4499,15 +4499,14 @@ setup_anchor(Node* node, regex_t* reg, int state, ScanEnv* env)
   ( ANCR_LOOK_BEHIND | ANCR_BEGIN_LINE | ANCR_END_LINE | ANCR_BEGIN_BUF \
   | ANCR_BEGIN_POSITION | ANCR_WORD_BOUNDARY | ANCR_NO_WORD_BOUNDARY \
   | ANCR_WORD_BEGIN | ANCR_WORD_END \
-  | ANCR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY \
-  | ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY )
+  | ANCR_TEXT_SEGMENT_BOUNDARY \
+  | ANCR_NO_TEXT_SEGMENT_BOUNDARY )
 
 #define ALLOWED_ANCHOR_IN_LB_NOT \
   ( ANCR_LOOK_BEHIND | ANCR_LOOK_BEHIND_NOT | ANCR_BEGIN_LINE \
   | ANCR_END_LINE | ANCR_BEGIN_BUF | ANCR_BEGIN_POSITION | ANCR_WORD_BOUNDARY \
   | ANCR_NO_WORD_BOUNDARY | ANCR_WORD_BEGIN | ANCR_WORD_END \
-  | ANCR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY \
-  | ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY )
+  | ANCR_TEXT_SEGMENT_BOUNDARY | ANCR_NO_TEXT_SEGMENT_BOUNDARY )
 
   int r;
   AnchorNode* an = ANCHOR_(node);
@@ -6782,10 +6781,10 @@ print_indent_tree(FILE* f, Node* node, int indent)
     case ANCR_WORD_BEGIN:       fputs("word begin", f);     break;
     case ANCR_WORD_END:         fputs("word end", f);       break;
 #endif
-    case ANCR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
-      fputs("extended-grapheme-cluster boundary", f); break;
-    case ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY:
-      fputs("no-extended-grapheme-cluster boundary", f); break;
+    case ANCR_TEXT_SEGMENT_BOUNDARY:
+      fputs("text-segment boundary", f); break;
+    case ANCR_NO_TEXT_SEGMENT_BOUNDARY:
+      fputs("no text-segment boundary", f); break;
     case ANCR_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 783e3b37496ce779118dfb357c1a058e215f7b0b..0c3bf60d0d69ef2bc3b59eb580e33a7a2f827457 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -479,8 +479,8 @@ typedef struct _BBuf {
 #define ANCR_WORD_END         (1<<13)
 #define ANCR_ANYCHAR_INF      (1<<14)
 #define ANCR_ANYCHAR_INF_ML   (1<<15)
-#define ANCR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY    (1<<16)
-#define ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY (1<<17)
+#define ANCR_TEXT_SEGMENT_BOUNDARY    (1<<16)
+#define ANCR_NO_TEXT_SEGMENT_BOUNDARY (1<<17)
 
 
 #define ANCHOR_HAS_BODY(a)      ((a)->type < ANCR_BEGIN_BUF)

diff --git a/src/regparse.c b/src/regparse.c
index e103b949225725b7d998143dfc4219caafeac08c..050a81682ade3dddb73c8d6adc3cb01397561b7e 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -2671,7 +2671,7 @@ node_new_callout(Node** node, OnigCalloutOf callout_of, int num, int id,
 #endif
 
 static int
-make_extended_grapheme_cluster(Node** node, ScanEnv* env)
+make_text_segment(Node** node, ScanEnv* env)
 {
   int r;
   int i;
@@ -2683,7 +2683,7 @@ make_extended_grapheme_cluster(Node** node, ScanEnv* env)
   ns[1] = NULL_NODE;
 
   r = ONIGERR_MEMORY;
-  ns[0] = onig_node_new_anchor(ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY, 0);
+  ns[0] = onig_node_new_anchor(ANCR_NO_TEXT_SEGMENT_BOUNDARY, 0);
   if (IS_NULL(ns[0])) goto err;
 
   r = node_new_true_anychar(&ns[1], env);
@@ -4054,7 +4054,7 @@ enum TokenSyms {
   TK_GENERAL_NEWLINE,  /* \R */
   TK_NO_NEWLINE,       /* \N */
   TK_TRUE_ANYCHAR,     /* \O */
-  TK_EXTENDED_GRAPHEME_CLUSTER, /* \X */
+  TK_TEXT_SEGMENT,     /* \X */
 
   /* in cc */
   TK_CC_CLOSE,
@@ -5049,13 +5049,13 @@ fetch_token(PToken* 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 = ANCR_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY;
+      tok->u.anchor = ANCR_TEXT_SEGMENT_BOUNDARY;
       break;
 
     case 'Y':
       if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP2_ESC_X_Y_GRAPHEME_CLUSTER)) break;
       tok->type = TK_ANCHOR;
-      tok->u.anchor = ANCR_NO_EXTENDED_GRAPHEME_CLUSTER_BOUNDARY;
+      tok->u.anchor = ANCR_NO_TEXT_SEGMENT_BOUNDARY;
       break;
 
 #ifdef USE_WORD_BEGIN_END
@@ -5136,7 +5136,7 @@ fetch_token(PToken* tok, UChar** src, UChar* end, ScanEnv* env)
 
     case 'X':
       if (! IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_X_Y_GRAPHEME_CLUSTER)) break;
-      tok->type = TK_EXTENDED_GRAPHEME_CLUSTER;
+      tok->type = TK_TEXT_SEGMENT;
       break;
 
     case 'A':
@@ -8082,8 +8082,8 @@ parse_exp(Node** np, PToken* tok, int term, UChar** src, UChar* end,
     if (r < 0) return r;
     break;
 
-  case TK_EXTENDED_GRAPHEME_CLUSTER:
-    r = make_extended_grapheme_cluster(np, env);
+  case TK_TEXT_SEGMENT:
+    r = make_text_segment(np, env);
     if (r < 0) return r;
     break;