refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 03cd2e4221921d29b914b681935330d5cdf6d0f5..2bd370a7ca362cca72a7539e1a4b821c00612203 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -1405,9 +1405,9 @@ compile_bag_memory_node(BagNode* node, regex_t* reg, ScanEnv* env)
 #endif
 
   if (MEM_STATUS_AT0(reg->push_mem_start, node->m.regnum))
-    r = add_op(reg, OP_MEMORY_START_PUSH);
+    r = add_op(reg, OP_MEM_START_PUSH);
   else
-    r = add_op(reg, OP_MEMORY_START);
+    r = add_op(reg, OP_MEM_START);
   if (r != 0) return r;
   COP(reg)->memory_start.num = node->m.regnum;
 
@@ -1417,9 +1417,9 @@ compile_bag_memory_node(BagNode* node, regex_t* reg, ScanEnv* env)
 #ifdef USE_CALL
   if (MEM_STATUS_AT0(reg->push_mem_end, node->m.regnum))
     r = add_op(reg, (NODE_IS_RECURSION(node)
-                     ? OP_MEMORY_END_PUSH_REC : OP_MEMORY_END_PUSH));
+                     ? OP_MEM_END_PUSH_REC : OP_MEM_END_PUSH));
   else
-    r = add_op(reg, (NODE_IS_RECURSION(node) ? OP_MEMORY_END_REC : OP_MEMORY_END));
+    r = add_op(reg, (NODE_IS_RECURSION(node) ? OP_MEM_END_REC : OP_MEM_END));
   if (r != 0) return r;
   COP(reg)->memory_end.num = node->m.regnum;
 
@@ -1429,9 +1429,9 @@ compile_bag_memory_node(BagNode* node, regex_t* reg, ScanEnv* env)
   }
 #else
   if (MEM_STATUS_AT0(reg->push_mem_end, node->m.regnum))
-    r = add_op(reg, OP_MEMORY_END_PUSH);
+    r = add_op(reg, OP_MEM_END_PUSH);
   else
-    r = add_op(reg, OP_MEMORY_END);
+    r = add_op(reg, OP_MEM_END);
   if (r != 0) return r;
   COP(reg)->memory_end.num = node->m.regnum;
 #endif

diff --git a/src/regexec.c b/src/regexec.c
index e0770643e0447a5a949f4c11bb85e9759f27c458..9dfa0634bbabd2e2420031a91d1e6d4174485ee0 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -211,12 +211,12 @@ static OpInfoType OpInfo[] = {
   { OP_BACKREF_WITH_LEVEL_IC, "backref_with_level-c" },
   { OP_BACKREF_CHECK,         "backref_check"        },
   { OP_BACKREF_CHECK_WITH_LEVEL, "backref_check_with_level" },
-  { OP_MEMORY_START_PUSH,     "mem-start-push"        },
-  { OP_MEMORY_START,          "mem-start"             },
-  { OP_MEMORY_END_PUSH,       "mem-end-push"          },
-  { OP_MEMORY_END_PUSH_REC,   "mem-end-push-rec"      },
-  { OP_MEMORY_END,            "mem-end"               },
-  { OP_MEMORY_END_REC,        "mem-end-rec"           },
+  { OP_MEM_START_PUSH,        "mem-start-push"        },
+  { OP_MEM_START,             "mem-start"             },
+  { OP_MEM_END_PUSH,          "mem-end-push"          },
+  { OP_MEM_END_PUSH_REC,      "mem-end-push-rec"      },
+  { OP_MEM_END,               "mem-end"               },
+  { OP_MEM_END_REC,           "mem-end-rec"           },
   { OP_FAIL,                  "fail"                  },
   { OP_JUMP,                  "jump"                  },
   { OP_PUSH,                  "push"                  },
@@ -456,15 +456,15 @@ print_compiled_byte_code(FILE* f, regex_t* reg, int index,
     }
     break;
 
-  case OP_MEMORY_START:
-  case OP_MEMORY_START_PUSH:
+  case OP_MEM_START:
+  case OP_MEM_START_PUSH:
     mem = p->memory_start.num;
     fprintf(f, ":%d", mem);
     break;
-  case OP_MEMORY_END_PUSH:
-  case OP_MEMORY_END_PUSH_REC:
-  case OP_MEMORY_END:
-  case OP_MEMORY_END_REC:
+  case OP_MEM_END_PUSH:
+  case OP_MEM_END_PUSH_REC:
+  case OP_MEM_END:
+  case OP_MEM_END_REC:
     mem = p->memory_end.num;
     fprintf(f, ":%d", mem);
     break;
@@ -2548,12 +2548,12 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
   &&L_BACKREF_WITH_LEVEL_IC,
   &&L_BACKREF_CHECK,
   &&L_BACKREF_CHECK_WITH_LEVEL,
-  &&L_MEMORY_START,
-  &&L_MEMORY_START_PUSH,
-  &&L_MEMORY_END_PUSH,
-  &&L_MEMORY_END_PUSH_REC,
-  &&L_MEMORY_END,
-  &&L_MEMORY_END_REC,
+  &&L_MEM_START,
+  &&L_MEM_START_PUSH,
+  &&L_MEM_END_PUSH,
+  &&L_MEM_END_PUSH_REC,
+  &&L_MEM_END,
+  &&L_MEM_END_REC,
   &&L_FAIL,
   &&L_JUMP,
   &&L_PUSH,
@@ -3387,32 +3387,32 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       INC_OP;
       JUMP_OUT;
 
-    CASE_OP(MEMORY_START_PUSH)
+    CASE_OP(MEM_START_PUSH)
       mem = p->memory_start.num;
       STACK_PUSH_MEM_START(mem, s);
       INC_OP;
       JUMP_OUT;
 
-    CASE_OP(MEMORY_START)
+    CASE_OP(MEM_START)
       mem = p->memory_start.num;
       mem_start_stk[mem] = (StackIndex )((void* )s);
       INC_OP;
       JUMP_OUT;
 
-    CASE_OP(MEMORY_END_PUSH)
+    CASE_OP(MEM_END_PUSH)
       mem = p->memory_end.num;
       STACK_PUSH_MEM_END(mem, s);
       INC_OP;
       JUMP_OUT;
 
-    CASE_OP(MEMORY_END)
+    CASE_OP(MEM_END)
       mem = p->memory_end.num;
       mem_end_stk[mem] = (StackIndex )((void* )s);
       INC_OP;
       JUMP_OUT;
 
 #ifdef USE_CALL
-    CASE_OP(MEMORY_END_PUSH_REC)
+    CASE_OP(MEM_END_PUSH_REC)
       mem = p->memory_end.num;
       STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */
       si = GET_STACK_INDEX(stkp);
@@ -3421,7 +3421,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       INC_OP;
       JUMP_OUT;
 
-    CASE_OP(MEMORY_END_REC)
+    CASE_OP(MEM_END_REC)
       mem = p->memory_end.num;
       mem_end_stk[mem] = (StackIndex )((void* )s);
       STACK_GET_MEM_START(mem, stkp);

diff --git a/src/regint.h b/src/regint.h
index a53885dbf16f0301bc872fbbc9e92fefcf7f9ab6..ae155ac06e27092d31df4a253ae6bc37af23df6c 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -558,12 +558,12 @@ enum OpCode {
   OP_BACKREF_WITH_LEVEL_IC,     /* \k<xxx+n>, \k<xxx-n> */
   OP_BACKREF_CHECK,             /* (?(n)), (?('name')) */
   OP_BACKREF_CHECK_WITH_LEVEL,  /* (?(n-level)), (?('name-level')) */
-  OP_MEMORY_START,
-  OP_MEMORY_START_PUSH,   /* push back-tracker to stack */
-  OP_MEMORY_END_PUSH,     /* push back-tracker to stack */
-  OP_MEMORY_END_PUSH_REC, /* push back-tracker to stack */
-  OP_MEMORY_END,
-  OP_MEMORY_END_REC,      /* push marker to stack */
+  OP_MEM_START,
+  OP_MEM_START_PUSH,     /* push back-tracker to stack */
+  OP_MEM_END_PUSH,       /* push back-tracker to stack */
+  OP_MEM_END_PUSH_REC,   /* push back-tracker to stack */
+  OP_MEM_END,
+  OP_MEM_END_REC,        /* push marker to stack */
   OP_FAIL,               /* pop stack and move */
   OP_JUMP,
   OP_PUSH,