Refactor code tree matchers

Indexing/ClauseCodeTree.cpp

@@ -245,7 +245,7 @@ void ClauseCodeTree::remove(Clause* cl)
     }
 
   iteration_restart:
-    if(!rlm->next()) {
+    if(!rlm->execute()) {
       if(depth==0) {
         ASSERTION_VIOLATION;
         INVALID_OPERATION("clause to be removed was not found");
@@ -286,7 +286,7 @@ void ClauseCodeTree::remove(Clause* cl)
 void ClauseCodeTree::RemovingLiteralMatcher::init(CodeOp* entry_, LitInfo* linfos_,
     size_t linfoCnt_, ClauseCodeTree* tree_, Stack<CodeOp*>* firstsInBlocks_)
 {
-  RemovingMatcher::init(entry_, linfos_, linfoCnt_, tree_, firstsInBlocks_);
+  Matcher::init(tree_, entry_, linfos_, linfoCnt_, firstsInBlocks_);
 
   ALWAYS(prepareLiteral());
 }
@@ -326,10 +326,7 @@ void ClauseCodeTree::LiteralMatcher::init(CodeTree* tree_, CodeOp* entry_,
 {
   ASS_G(linfoCnt_,0);
 
-  Matcher::init(tree_,entry_);
-
-  linfos=linfos_;
-  linfoCnt=linfoCnt_;
+  Matcher::init(tree_,entry_,linfos_,linfoCnt_);
 
   _eagerlyMatched=false;
   eagerResults.reset();
@@ -341,7 +338,7 @@ void ClauseCodeTree::LiteralMatcher::init(CodeTree* tree_, CodeOp* entry_,
     //(and those must be at the entry point or its alternatives)
 
     _eagerlyMatched=true;
-    _fresh=false;
+    fresh=false;
     CodeOp* sop=entry;
     while(sop) {
       if(sop->isSuccess()) {

Indexing/ClauseCodeTree.hpp

@@ -55,7 +55,7 @@ class ClauseCodeTree : public CodeTree
   bool removeOneOfAlternatives(CodeOp* op, Clause* cl, Stack<CodeOp*>* firstsInBlocks);
 
   struct RemovingLiteralMatcher
-  : public RemovingMatcher<false>
+  : public Matcher</*removing*/true,false>
   {
     void init(CodeOp* entry_, LitInfo* linfos_, size_t linfoCnt_,
 	ClauseCodeTree* tree_, Stack<CodeOp*>* firstsInBlocks_);
@@ -69,7 +69,7 @@ class ClauseCodeTree : public CodeTree
    *
    * Here the actual execution of the code of the tree takes place */
   struct LiteralMatcher
-  : public Matcher
+  : public Matcher</*removing*/false,false>
   {
     void init(CodeTree* tree, CodeOp* entry_, LitInfo* linfos_, size_t linfoCnt_, bool seekOnlySuccess=false);
     bool next();