rename IN_REPEAT to IN_REAL_REPEAT

diff --git a/src/regcomp.c b/src/regcomp.c
index 030a73eb9f5927c35e139b20bc012a49520d2a4e..1e3878dc2549a70ff3895aad7b38cd53c31bf8c6 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -779,7 +779,7 @@ compile_range_repeat_node(QtfrNode* qn, int target_len, int empty_info,
 #ifdef USE_SUBEXP_CALL
       NODE_IS_IN_MULTI_ENTRY(qn) ||
 #endif
-      NODE_IS_IN_REPEAT(qn)) {
+      NODE_IS_IN_REAL_REPEAT(qn)) {
     r = add_opcode(reg, qn->greedy ? OP_REPEAT_INC_SG : OP_REPEAT_INC_NG_SG);
   }
   else {
@@ -3669,7 +3669,7 @@ quantifiers_memory_node_info(Node* node)
 
 #define IN_ALT          (1<<0)
 #define IN_NOT          (1<<1)
-#define IN_REPEAT       (1<<2)
+#define IN_REAL_REPEAT  (1<<2)
 #define IN_VAR_REPEAT   (1<<3)
 #define IN_ZERO_REPEAT  (1<<4)
 #define IN_MULTI_ENTRY  (1<<5)
@@ -3897,7 +3897,7 @@ setup_called_state_call(Node* node, int state)
       QtfrNode* qn = QTFR_(node);
 
       if (IS_REPEAT_INFINITE(qn->upper) || qn->upper >= 2)
-        state |= IN_REPEAT;
+        state |= IN_REAL_REPEAT;
       if (qn->lower != qn->upper)
         state |= IN_VAR_REPEAT;
 
@@ -4000,7 +4000,7 @@ setup_called_state(Node* node, int state)
       QtfrNode* qn = QTFR_(node);
 
       if (IS_REPEAT_INFINITE(qn->upper) || qn->upper >= 2)
-        state |= IN_REPEAT;
+        state |= IN_REAL_REPEAT;
       if (qn->lower != qn->upper)
         state |= IN_VAR_REPEAT;
 
@@ -4119,8 +4119,8 @@ setup_qtfr(Node* node, regex_t* reg, int state, ScanEnv* env)
   QtfrNode* qn = QTFR_(node);
   Node* target = NODE_BODY(node);
 
-  if ((state & IN_REPEAT) != 0) {
-    NODE_STATUS_ADD(node, NST_IN_REPEAT);
+  if ((state & IN_REAL_REPEAT) != 0) {
+    NODE_STATUS_ADD(node, NST_IN_REAL_REPEAT);
   }
   if ((state & IN_MULTI_ENTRY) != 0) {
     NODE_STATUS_ADD(node, NST_IN_MULTI_ENTRY);
@@ -4148,7 +4148,7 @@ setup_qtfr(Node* node, regex_t* reg, int state, ScanEnv* env)
   }
 
   if (IS_REPEAT_INFINITE(qn->upper) || qn->upper >= 2)
-    state |= IN_REPEAT;
+    state |= IN_REAL_REPEAT;
   if (qn->lower != qn->upper)
     state |= IN_VAR_REPEAT;
 

diff --git a/src/regparse.h b/src/regparse.h
index 8c05a3d319cf46e0b6f2e1d8d74c118987a8c1d7..b6c2bc4ecd9063e8de5890c191e901daec44e0ff 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -130,7 +130,7 @@ typedef enum {
 #define NST_ADDR_FIXED            (1<<8)
 #define NST_NAMED_GROUP           (1<<9)
 #define NST_NAME_REF              (1<<10)
-#define NST_IN_REPEAT             (1<<11) /* STK_REPEAT is nested in stack. */
+#define NST_IN_REAL_REPEAT        (1<<11) /* STK_REPEAT is nested in stack. */
 #define NST_IN_MULTI_ENTRY        (1<<12)
 #define NST_IN_ZERO_REPEAT        (1<<13) /* (....){0} */
 #define NST_NEST_LEVEL            (1<<14)
@@ -141,7 +141,7 @@ typedef enum {
 #define NODE_STATUS_REMOVE(node,f)  (NODE_STATUS(node) &= ~(f))
 
 #define NODE_IS_BY_NUMBER(node)       ((NODE_STATUS(node) & NST_BY_NUMBER) != 0)
-#define NODE_IS_IN_REPEAT(node)       ((NODE_STATUS(node) & NST_IN_REPEAT) != 0)
+#define NODE_IS_IN_REAL_REPEAT(node)  ((NODE_STATUS(node) & NST_IN_REAL_REPEAT) != 0)
 #define NODE_IS_CALLED(node)          ((NODE_STATUS(node) & NST_CALLED)    != 0)
 #define NODE_IS_IN_MULTI_ENTRY(node)  ((NODE_STATUS(node) & NST_IN_MULTI_ENTRY) != 0)
 #define NODE_IS_RECURSION(node)       ((NODE_STATUS(node) & NST_RECURSION) != 0)