rename target_empty_info to body_empty_info

diff --git a/src/regcomp.c b/src/regcomp.c
index 96645c4e8be1aa6e0b17807a3da06808d638af74..9b7d6c6da7bf5dae70e26662587afb33cccbbe43 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -811,7 +811,7 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
   int len, mod_tlen, cklen;
   int ckn;
   int infinite = IS_REPEAT_INFINITE(qn->upper);
-  int empty_info = qn->target_empty_info;
+  int empty_info = qn->body_empty_info;
   int tlen = compile_length_tree(qn->target, reg);
 
   if (tlen < 0) return tlen;
@@ -891,7 +891,7 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
   int r, mod_tlen;
   int ckn;
   int infinite = IS_REPEAT_INFINITE(qn->upper);
-  int empty_info = qn->target_empty_info;
+  int empty_info = qn->body_empty_info;
   int tlen = compile_length_tree(qn->target, reg);
 
   if (tlen < 0) return tlen;
@@ -1044,7 +1044,7 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
 {
   int len, mod_tlen;
   int infinite = IS_REPEAT_INFINITE(qn->upper);
-  int empty_info = qn->target_empty_info;
+  int empty_info = qn->body_empty_info;
   int tlen = compile_length_tree(NODE_BODY((Node* )qn), reg);
 
   if (tlen < 0) return tlen;
@@ -1109,7 +1109,7 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg)
 {
   int i, r, mod_tlen;
   int infinite = IS_REPEAT_INFINITE(qn->upper);
-  int empty_info = qn->target_empty_info;
+  int empty_info = qn->body_empty_info;
   int tlen = compile_length_tree(NODE_BODY((Node* )qn), reg);
 
   if (tlen < 0) return tlen;
@@ -3764,7 +3764,7 @@ quantifiers_memory_node_info(Node* node, int state)
 #endif /* USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT */
 
 /* setup_tree does the following work.
- 1. check empty loop. (set qn->target_empty_info)
+ 1. check empty loop. (set qn->body_empty_info)
  2. expand ignore-case in char class.
  3. set memory status bit flags. (reg->mem_stats)
  4. set qn->head_exact for [push, exact] -> [push_or_jump_exact1, exact].
@@ -3851,12 +3851,12 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
         r = get_min_len(target, &d, env);
         if (r) break;
         if (d == 0) {
-          qn->target_empty_info = NQ_BODY_IS_EMPTY;
+          qn->body_empty_info = NQ_BODY_IS_EMPTY;
 #ifdef USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT
           r = quantifiers_memory_node_info(target, state);
           if (r < 0) break;
           if (r > 0) {
-            qn->target_empty_info = r;
+            qn->body_empty_info = r;
             if (r == NQ_BODY_IS_EMPTY_REC) {
               if (NTYPE(target) == NT_ENCLOSE &&
                   NENCLOSE(target)->type == ENCLOSE_MEMORY) {
@@ -3907,7 +3907,7 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
       }
 
 #ifdef USE_OP_PUSH_OR_JUMP_EXACT
-      if (qn->greedy && (qn->target_empty_info != 0)) {
+      if (qn->greedy && (qn->body_empty_info != 0)) {
         if (NTYPE(target) == NT_QTFR) {
           QtfrNode* tqn = NQTFR(target);
           if (IS_NOT_NULL(tqn->head_exact)) {

diff --git a/src/regparse.c b/src/regparse.c
index aeec1d815ce594e5a413ec0430a99da06d5de001..0267a38d1044ad784146d3b03eee2d3741bc2062 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1297,10 +1297,10 @@ node_new_quantifier(int lower, int upper, int by_number)
   NQTFR(node)->lower  = lower;
   NQTFR(node)->upper  = upper;
   NQTFR(node)->greedy = 1;
-  NQTFR(node)->target_empty_info = NQ_BODY_ISNOT_EMPTY;
-  NQTFR(node)->head_exact        = NULL_NODE;
-  NQTFR(node)->next_head_exact   = NULL_NODE;
-  NQTFR(node)->is_refered        = 0;
+  NQTFR(node)->body_empty_info = NQ_BODY_ISNOT_EMPTY;
+  NQTFR(node)->head_exact      = NULL_NODE;
+  NQTFR(node)->next_head_exact = NULL_NODE;
+  NQTFR(node)->is_refered      = 0;
   if (by_number != 0)
     NODE_STATUS_SET(node, NST_BY_NUMBER);
 

diff --git a/src/regparse.h b/src/regparse.h
index ced1580dde8f36b6940a523d1c4d6229bbcc87be..12b96899c9aa7b3c2ef16a38cd4cfeab6a3db2fe 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -170,7 +170,7 @@ typedef struct {
   int lower;
   int upper;
   int greedy;
-  int target_empty_info;
+  int body_empty_info;
   struct _Node* head_exact;
   struct _Node* next_head_exact;
   int is_refered;     /* include called node. don't eliminate even if {0} */