remove st_mem_start/end members from ScanEnv

diff --git a/src/regcomp.c b/src/regcomp.c
index d743a9a376fbfca93befe301d24d7a1dada0836b..559a316a9804421090e9a9cd7ebecf1811e10c2a 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -4850,12 +4850,6 @@ setup_quant(Node* node, regex_t* reg, int state, ScanEnv* env)
     if (d == 0) {
 #ifdef USE_STUBBORN_CHECK_CAPTURES_IN_EMPTY_REPEAT
       qn->emptiness = quantifiers_memory_node_info(body);
-      if (qn->emptiness == BODY_IS_EMPTY_POSSIBILITY_REC) {
-        if (NODE_TYPE(body) == NODE_BAG &&
-            BAG_(body)->type == BAG_MEMORY) {
-          MEM_STATUS_ON(env->st_mem_end, BAG_(body)->m.regnum);
-        }
-      }
 #else
       qn->emptiness = BODY_IS_EMPTY_POSSIBILITY;
 #endif
@@ -4955,11 +4949,9 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
       for (i = 0; i < br->back_num; i++) {
         if (p[i] > env->num_mem)  return ONIGERR_INVALID_BACKREF;
         MEM_STATUS_ON(env->backrefed_mem, p[i]);
-        MEM_STATUS_ON(env->st_mem_start, p[i]);
 #ifdef USE_BACKREF_WITH_LEVEL
         if (NODE_IS_NEST_LEVEL(node)) {
           MEM_STATUS_ON(env->backtrack_mem, p[i]);
-          MEM_STATUS_ON(env->st_mem_end, p[i]);
         }
 #endif
       }
@@ -4987,7 +4979,6 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
 
         if ((state & (IN_ALT | IN_NOT | IN_VAR_REPEAT | IN_MULTI_ENTRY)) != 0
             || NODE_IS_RECURSION(node)) {
-          MEM_STATUS_ON(env->st_mem_start, en->m.regnum);
           MEM_STATUS_ON(env->backtrack_mem, en->m.regnum);
         }
         r = setup_tree(NODE_BODY(node), reg, state, env);

diff --git a/src/regparse.c b/src/regparse.c
index 7ba4b2655152c33a244fc274e2dc3c955ebe9d72..3dd5ab97d4083ca8b60403f76cdf948a25491b08 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1946,8 +1946,6 @@ static void
 scan_env_clear(ScanEnv* env)
 {
   MEM_STATUS_CLEAR(env->cap_history);
-  MEM_STATUS_CLEAR(env->st_mem_start);
-  MEM_STATUS_CLEAR(env->st_mem_end);
   MEM_STATUS_CLEAR(env->backtrack_mem);
   MEM_STATUS_CLEAR(env->backrefed_mem);
   env->error      = (UChar* )NULL;

diff --git a/src/regparse.h b/src/regparse.h
index bb346a1418e11877fa8ce64560871406b878ad6a..d23848db116cbeb3ab009949c563a6d121c9ec62 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -399,8 +399,6 @@ typedef struct {
   OnigEncoding     enc;
   OnigSyntaxType*  syntax;
   MemStatusType    cap_history;
-  MemStatusType    st_mem_start;
-  MemStatusType    st_mem_end;
   MemStatusType    backtrack_mem; /* backtrack/recursion */
   MemStatusType    backrefed_mem;
   UChar*           pattern;