refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 90fc8321118d49a39438926026dea7204f34d81d..fa6affeb6be51827b5c5fd9e018bedf6be01816c 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1020,7 +1020,7 @@ compile_length_quantifier_node(QuantNode* qn, regex_t* reg)
       len += OPSIZE_JUMP + mod_tlen + OPSIZE_PUSH;
   }
   else if (qn->upper == 0) {
-    if (qn->is_refered != 0) { /* /(?<n>..){0}/ */
+    if (qn->include_referred != 0) { /* /(?<n>..){0}/ */
       len = OPSIZE_JUMP + tlen;
     }
     else
@@ -1163,7 +1163,7 @@ compile_quantifier_node(QuantNode* qn, regex_t* reg, ScanEnv* env)
     }
   }
   else if (qn->upper == 0) {
-    if (qn->is_refered != 0) { /* /(?<n>..){0}/ */
+    if (qn->include_referred != 0) { /* /(?<n>..){0}/ */
       r = add_op(reg, OP_JUMP);
       if (r != 0) return r;
       COP(reg)->jump.addr = tlen + SIZE_INC;
@@ -3472,7 +3472,7 @@ recursive_call_check_trav(Node* node, ScanEnv* env, int state)
     r = recursive_call_check_trav(NODE_BODY(node), env, state);
     if (QUANT_(node)->upper == 0) {
       if (r == FOUND_CALLED_NODE)
-        QUANT_(node)->is_refered = 1;
+        QUANT_(node)->include_referred = 1;
     }
     break;
 

diff --git a/src/regparse.c b/src/regparse.c
index 72de9f7f84129a275a89011075c3a016f4cfcb33..1876242bcac443fceb6337b3317f0bd5a66ef9cf 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -2393,13 +2393,13 @@ node_new_quantifier(int lower, int upper, int by_number)
   CHECK_NULL_RETURN(node);
 
   NODE_SET_TYPE(node, NODE_QUANT);
-  QUANT_(node)->lower           = lower;
-  QUANT_(node)->upper           = upper;
-  QUANT_(node)->greedy          = 1;
-  QUANT_(node)->emptiness       = BODY_IS_NOT_EMPTY;
-  QUANT_(node)->head_exact      = NULL_NODE;
-  QUANT_(node)->next_head_exact = NULL_NODE;
-  QUANT_(node)->is_refered      = 0;
+  QUANT_(node)->lower            = lower;
+  QUANT_(node)->upper            = upper;
+  QUANT_(node)->greedy           = 1;
+  QUANT_(node)->emptiness        = BODY_IS_NOT_EMPTY;
+  QUANT_(node)->head_exact       = NULL_NODE;
+  QUANT_(node)->next_head_exact  = NULL_NODE;
+  QUANT_(node)->include_referred = 0;
   if (by_number != 0)
     NODE_STATUS_ADD(node, BY_NUMBER);
 

diff --git a/src/regparse.h b/src/regparse.h
index d97db915d4245d632d36b1a8a250cd5a71af1831..b7bab21a124830570989239debd9ca4009606615 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -104,7 +104,7 @@ typedef struct {
   enum BodyEmptyType emptiness;
   struct _Node* head_exact;
   struct _Node* next_head_exact;
-  int is_refered;     /* include called node. don't eliminate even if {0} */
+  int include_referred;   /* include called node. don't eliminate even if {0} */
 } QuantNode;
 
 typedef struct {