refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 145469d800ac5ceb3c5dac4e3a76e650fbaf81c8..4a02fca69bcb524cf75cce87870d86a4834dfea1 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -439,7 +439,7 @@ compile_tree_empty_check(Node* node, regex_t* reg, int empty_info, ScanEnv* env)
   int r;
   int saved_num_null_check = reg->num_null_check;
 
-  if (empty_info != 0) {
+  if (empty_info != NQ_BODY_IS_NOT_EMPTY) {
     r = add_opcode(reg, OP_EMPTY_CHECK_START);
     if (r != 0) return r;
     r = add_mem_num(reg, reg->num_null_check); /* NULL CHECK ID */
@@ -450,7 +450,7 @@ compile_tree_empty_check(Node* node, regex_t* reg, int empty_info, ScanEnv* env)
   r = compile_tree(node, reg, env);
   if (r != 0) return r;
 
-  if (empty_info != 0) {
+  if (empty_info != NQ_BODY_IS_NOT_EMPTY) {
     if (empty_info == NQ_BODY_IS_EMPTY)
       r = add_opcode(reg, OP_EMPTY_CHECK_END);
     else if (empty_info == NQ_BODY_IS_EMPTY_MEM)
@@ -830,10 +830,10 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
     }
   }
 
-  if (empty_info != 0)
-    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
-  else
+  if (empty_info == NQ_BODY_IS_NOT_EMPTY)
     mod_tlen = tlen;
+  else
+    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
 
   if (infinite && qn->lower <= 1) {
     if (qn->greedy) {
@@ -933,10 +933,10 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg, ScanEnv* env)
     }
   }
 
-  if (empty_info != 0)
-    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
-  else
+  if (empty_info == NQ_BODY_IS_NOT_EMPTY)
     mod_tlen = tlen;
+  else
+    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
 
   if (infinite && qn->lower <= 1) {
     if (qn->greedy) {
@@ -1059,10 +1059,10 @@ compile_length_quantifier_node(QtfrNode* qn, regex_t* reg)
     }
   }
 
-  if (empty_info != 0)
-    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
-  else
+  if (empty_info == NQ_BODY_IS_NOT_EMPTY)
     mod_tlen = tlen;
+  else
+    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
 
   if (infinite &&
       (qn->lower <= 1 || tlen * qn->lower <= QUANTIFIER_EXPAND_LIMIT_SIZE)) {
@@ -1133,10 +1133,10 @@ compile_quantifier_node(QtfrNode* qn, regex_t* reg, ScanEnv* env)
     }
   }
 
-  if (empty_info != 0)
-    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
-  else
+  if (empty_info == NQ_BODY_IS_NOT_EMPTY)
     mod_tlen = tlen;
+  else
+    mod_tlen = tlen + (SIZE_OP_EMPTY_CHECK_START + SIZE_OP_EMPTY_CHECK_END);
 
   if (infinite &&
       (qn->lower <= 1 || tlen * qn->lower <= QUANTIFIER_EXPAND_LIMIT_SIZE)) {

diff --git a/src/regparse.c b/src/regparse.c
index cede4dd593951e8f2335afcd3989776d54bc7bdb..1d7c78346ee1c34097f50d9b096bb562ab7cea1c 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1286,7 +1286,7 @@ node_new_quantifier(int lower, int upper, int by_number)
   QTFR_(node)->lower  = lower;
   QTFR_(node)->upper  = upper;
   QTFR_(node)->greedy = 1;
-  QTFR_(node)->body_empty_info = NQ_BODY_ISNOT_EMPTY;
+  QTFR_(node)->body_empty_info = NQ_BODY_IS_NOT_EMPTY;
   QTFR_(node)->head_exact      = NULL_NODE;
   QTFR_(node)->next_head_exact = NULL_NODE;
   QTFR_(node)->is_refered      = 0;

diff --git a/src/regparse.h b/src/regparse.h
index b6c2bc4ecd9063e8de5890c191e901daec44e0ff..eda9f312e0bacaf941131e6dad2a5e28262a9d9f 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -113,7 +113,7 @@ typedef enum {
 #define BACKREFS_P(br) \
   (IS_NOT_NULL((br)->back_dynamic) ? (br)->back_dynamic : (br)->back_static);
 
-#define NQ_BODY_ISNOT_EMPTY     0
+#define NQ_BODY_IS_NOT_EMPTY    0
 #define NQ_BODY_IS_EMPTY        1
 #define NQ_BODY_IS_EMPTY_MEM    2
 #define NQ_BODY_IS_EMPTY_REC    3