refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 2bd370a7ca362cca72a7539e1a4b821c00612203..92d97992669c854c7b16ccdf81d414aa2269466e 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1275,30 +1275,30 @@ compile_length_bag_node(BagNode* node, regex_t* reg)
     }
 
     if (NODE_IS_CALLED(node)) {
-      len = OPSIZE_MEMORY_START_PUSH + tlen
+      len = OPSIZE_MEM_START_PUSH + tlen
         + OPSIZE_CALL + OPSIZE_JUMP + OPSIZE_RETURN;
       if (MEM_STATUS_AT0(reg->push_mem_end, node->m.regnum))
         len += (NODE_IS_RECURSION(node)
-                ? OPSIZE_MEMORY_END_PUSH_REC : OPSIZE_MEMORY_END_PUSH);
+                ? OPSIZE_MEM_END_PUSH_REC : OPSIZE_MEM_END_PUSH);
       else
         len += (NODE_IS_RECURSION(node)
-                ? OPSIZE_MEMORY_END_REC : OPSIZE_MEMORY_END);
+                ? OPSIZE_MEM_END_REC : OPSIZE_MEM_END);
     }
     else if (NODE_IS_RECURSION(node)) {
-      len = OPSIZE_MEMORY_START_PUSH;
+      len = OPSIZE_MEM_START_PUSH;
       len += tlen + (MEM_STATUS_AT0(reg->push_mem_end, node->m.regnum)
-                     ? OPSIZE_MEMORY_END_PUSH_REC : OPSIZE_MEMORY_END_REC);
+                     ? OPSIZE_MEM_END_PUSH_REC : OPSIZE_MEM_END_REC);
     }
     else
 #endif
     {
       if (MEM_STATUS_AT0(reg->push_mem_start, node->m.regnum))
-        len = OPSIZE_MEMORY_START_PUSH;
+        len = OPSIZE_MEM_START_PUSH;
       else
-        len = OPSIZE_MEMORY_START;
+        len = OPSIZE_MEM_START;
 
       len += tlen + (MEM_STATUS_AT0(reg->push_mem_end, node->m.regnum)
-                     ? OPSIZE_MEMORY_END_PUSH : OPSIZE_MEMORY_END);
+                     ? OPSIZE_MEM_END_PUSH : OPSIZE_MEM_END);
     }
     break;
 
@@ -1389,13 +1389,12 @@ compile_bag_memory_node(BagNode* node, regex_t* reg, ScanEnv* env)
     }
     else {
       len = compile_length_tree(NODE_BAG_BODY(node), reg);
-      len += (OPSIZE_MEMORY_START_PUSH + OPSIZE_RETURN);
+      len += (OPSIZE_MEM_START_PUSH + OPSIZE_RETURN);
       if (MEM_STATUS_AT0(reg->push_mem_end, node->m.regnum))
         len += (NODE_IS_RECURSION(node)
-                ? OPSIZE_MEMORY_END_PUSH_REC : OPSIZE_MEMORY_END_PUSH);
+                ? OPSIZE_MEM_END_PUSH_REC : OPSIZE_MEM_END_PUSH);
       else
-        len += (NODE_IS_RECURSION(node)
-                ? OPSIZE_MEMORY_END_REC : OPSIZE_MEMORY_END);
+        len += (NODE_IS_RECURSION(node) ? OPSIZE_MEM_END_REC : OPSIZE_MEM_END);
 
       r = add_op(reg, OP_JUMP);
       if (r != 0) return r;

diff --git a/src/regint.h b/src/regint.h
index ae155ac06e27092d31df4a253ae6bc37af23df6c..fe4ee9bbb2a31e86ab0b1b73898cb000cc4b65cb 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -688,12 +688,12 @@ typedef int ModeType;
 #define OPSIZE_PREC_READ_NOT_END       1
 #define OPSIZE_BACKREF                 1
 #define OPSIZE_FAIL                    1
-#define OPSIZE_MEMORY_START            1
-#define OPSIZE_MEMORY_START_PUSH       1
-#define OPSIZE_MEMORY_END_PUSH         1
-#define OPSIZE_MEMORY_END_PUSH_REC     1
-#define OPSIZE_MEMORY_END              1
-#define OPSIZE_MEMORY_END_REC          1
+#define OPSIZE_MEM_START               1
+#define OPSIZE_MEM_START_PUSH          1
+#define OPSIZE_MEM_END_PUSH            1
+#define OPSIZE_MEM_END_PUSH_REC        1
+#define OPSIZE_MEM_END                 1
+#define OPSIZE_MEM_END_REC             1
 #define OPSIZE_ATOMIC_START            1
 #define OPSIZE_ATOMIC_END              1
 #define OPSIZE_EMPTY_CHECK_START       1