refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 24192a77b378f7052c1748f102b179922fa926e7..a5c328a1127a9d7178e32cc0fa10e7c1e9458401 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -753,7 +753,7 @@ compile_length_string_node(Node* node, regex_t* reg)
   if (sn->end <= sn->s)
     return 0;
 
-  ambig = NODE_STRING_IS_AMBIG(node);
+  ambig = NODE_STRING_IS_CASE_EXPANDED(node);
   if (ambig != 0) {
     return 1;
   }
@@ -841,7 +841,7 @@ compile_string_node(Node* node, regex_t* reg)
     return 0;
 
   end = sn->end;
-  ambig = NODE_STRING_IS_AMBIG(node);
+  ambig = NODE_STRING_IS_CASE_EXPANDED(node);
   if (ambig != 0) {
     return compile_ambig_string_node(node, reg);
   }
@@ -2732,7 +2732,7 @@ is_exclusive(Node* x, Node* y, regex_t* reg)
 
           len = NODE_STRING_LEN(x);
           if (len > NODE_STRING_LEN(y)) len = NODE_STRING_LEN(y);
-          if (NODE_STRING_IS_AMBIG(x) || NODE_STRING_IS_AMBIG(y)) {
+          if (NODE_STRING_IS_CASE_EXPANDED(x) || NODE_STRING_IS_CASE_EXPANDED(y)) {
             /* tiny version */
             return 0;
           }
@@ -3956,7 +3956,7 @@ expand_case_fold_make_rem_string(Node** rnode, UChar *s, UChar *end, regex_t* re
     return r;
   }
 
-  NODE_STRING_SET_AMBIG(node);
+  NODE_STRING_SET_CASE_EXPANDED(node);
   NODE_STRING_SET_DONT_GET_OPT_INFO(node);
   *rnode = node;
   return 0;
@@ -4109,7 +4109,7 @@ expand_case_fold_string(Node* node, regex_t* reg, int state)
   UChar buf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
   StrNode* sn;
 
-  if (NODE_STRING_IS_AMBIG(node)) return 0;
+  if (NODE_STRING_IS_CASE_EXPANDED(node)) return 0;
 
   sn = STR_(node);
 
@@ -4161,7 +4161,7 @@ expand_case_fold_string(Node* node, regex_t* reg, int state)
         prev_is_good  =  0; /* escape compiler warning */
       }
       else {
-        prev_is_ambig = NODE_STRING_IS_AMBIG(snode);
+        prev_is_ambig = NODE_STRING_IS_CASE_EXPANDED(snode);
         prev_is_good  = NODE_STRING_IS_GOOD_AMBIG(snode);
       }
 
@@ -4197,7 +4197,7 @@ expand_case_fold_string(Node* node, regex_t* reg, int state)
         if (r != 0) goto err;
       }
 
-      if (n != 0) NODE_STRING_SET_AMBIG(snode);
+      if (n != 0) NODE_STRING_SET_CASE_EXPANDED(snode);
       if (is_good != 0) NODE_STRING_SET_GOOD_AMBIG(snode);
     }
     else {
@@ -5824,7 +5824,7 @@ optimize_nodes(Node* node, OptNode* opt, OptEnv* env)
       int slen = (int )(sn->end - sn->s);
       /* int is_raw = NODE_STRING_IS_RAW(node); */
 
-      if (! NODE_STRING_IS_AMBIG(node)) {
+      if (! NODE_STRING_IS_CASE_EXPANDED(node)) {
         concat_opt_exact_str(&opt->sb, sn->s, sn->end, enc);
         if (slen > 0) {
           add_char_opt_map(&opt->map, *(sn->s), enc);
@@ -7039,8 +7039,8 @@ print_indent_tree(FILE* f, Node* node, int indent)
 
       if (NODE_STRING_IS_RAW(node))
         mode = "-raw";
-      else if (NODE_STRING_IS_AMBIG(node))
-        mode = "-ambig";
+      else if (NODE_STRING_IS_CASE_EXPANDED(node))
+        mode = "-case_expanded";
       else
         mode = "";
 

diff --git a/src/regparse.c b/src/regparse.c
index b6238a84bdfa76e0ff5048ca7c8c82f60bbda83b..b225428f75dc1d0159c2695835444546deaed5ab 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -7845,7 +7845,7 @@ i_apply_case_fold(OnigCodePoint from, OnigCodePoint to[], int to_len, void* arg)
 
           /* char-class expanded multi-char only
              compare with string folded at match time. */
-          NODE_STRING_SET_AMBIG(snode);
+          NODE_STRING_SET_CASE_EXPANDED(snode);
         }
         else {
           r = onig_node_str_cat(snode, buf, buf + len);

diff --git a/src/regparse.h b/src/regparse.h
index 7916fe7a515df26ed3f07612bc29b8add9fb4fae..d7a97bb9a39af62d4242b9532502ce2ce240b009 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -294,21 +294,21 @@ typedef struct _Node {
 #define ANCR_END_BUF_MASK      (ANCR_END_BUF | ANCR_SEMI_END_BUF)
 
 #define NODE_STRING_RAW                (1<<0) /* by backslashed number */
-#define NODE_STRING_AMBIG              (1<<1)
+#define NODE_STRING_CASE_EXPANDED      (1<<1)
 #define NODE_STRING_GOOD_AMBIG         (1<<2)
 #define NODE_STRING_DONT_GET_OPT_INFO  (1<<3)
 
 #define NODE_STRING_LEN(node)            (int )((node)->u.str.end - (node)->u.str.s)
-#define NODE_STRING_SET_RAW(node)        (node)->u.str.flag |= NODE_STRING_RAW
-#define NODE_STRING_CLEAR_RAW(node)      (node)->u.str.flag &= ~NODE_STRING_RAW
-#define NODE_STRING_SET_AMBIG(node)      (node)->u.str.flag |= NODE_STRING_AMBIG
+#define NODE_STRING_SET_RAW(node)           (node)->u.str.flag |= NODE_STRING_RAW
+#define NODE_STRING_CLEAR_RAW(node)         (node)->u.str.flag &= ~NODE_STRING_RAW
+#define NODE_STRING_SET_CASE_EXPANDED(node) (node)->u.str.flag |= NODE_STRING_CASE_EXPANDED
 #define NODE_STRING_SET_GOOD_AMBIG(node) (node)->u.str.flag |= NODE_STRING_GOOD_AMBIG
 #define NODE_STRING_SET_DONT_GET_OPT_INFO(node) \
   (node)->u.str.flag |= NODE_STRING_DONT_GET_OPT_INFO
 #define NODE_STRING_IS_RAW(node) \
   (((node)->u.str.flag & NODE_STRING_RAW) != 0)
-#define NODE_STRING_IS_AMBIG(node) \
-  (((node)->u.str.flag & NODE_STRING_AMBIG) != 0)
+#define NODE_STRING_IS_CASE_EXPANDED(node) \
+  (((node)->u.str.flag & NODE_STRING_CASE_EXPANDED) != 0)
 #define NODE_STRING_IS_GOOD_AMBIG(node) \
   (((node)->u.str.flag & NODE_STRING_GOOD_AMBIG) != 0)
 #define NODE_STRING_IS_DONT_GET_OPT_INFO(node) \