Finish iterator class

diff --git a/src/AST/iterator.cc b/src/AST/iterator.cc
index ac81e96ad8fe8b91b1f86a1b4628e932725aa64c..2a18889dc2ad39564b40df6fc7e9222874b5e3ce 100644 (file)
--- a/src/AST/iterator.cc
+++ b/src/AST/iterator.cc
@@ -1,5 +1,6 @@
 #include "iterator.h"
 #include "boolean.h"
+#include "element.h"
 #include "csolver.h"
 
 BooleanIterator::BooleanIterator(CSolver * _solver) :
@@ -50,7 +51,7 @@ void BooleanIterator::updateNext() {
                        index.push(topindex+1);
                        Boolean *newchild=logicop->inputs.get(topindex).getBoolean();
                        if (discovered.add(newchild)) {
-                               boolean.push(logicop->inputs.get(topindex).getBoolean());
+                               boolean.push(newchild);
                                index.push(0);
                        }
                        break;
@@ -66,3 +67,81 @@ Boolean * BooleanIterator::next() {
        updateNext();
        return b;
 }
+
+ElementIterator::ElementIterator(CSolver *_solver) :
+       bit(_solver),
+       base(NULL),
+       baseindex(0) {
+       
+}
+
+ElementIterator::~ElementIterator() {
+}
+
+bool ElementIterator::hasNext() {
+       return element.getSize() != 0;
+}
+
+void ElementIterator::updateNext() {
+       if (element.getSize() != 0) {
+               element.pop();
+               index.pop();
+       }
+       
+       while(true) {
+               if (element.getSize() == 0) {
+                       if (base != NULL) {
+                               if (baseindex == base->inputs.getSize()) {
+                                       base = NULL;
+                                       continue;
+                               } else {
+                                       Element * e = base->inputs.get(baseindex);
+                                       baseindex++;
+                                       if (discovered.add(e)) {
+                                               element.push(e);
+                                               index.push(0);
+                                       }
+                               }
+                       } else {
+                               if (bit.hasNext()) {
+                                       Boolean *b=bit.next();
+                                       if (b->type == PREDICATEOP) {
+                                               base = (BooleanPredicate *)b;
+                                               baseindex=0;
+                                       }
+                                       continue;
+                               } else
+                                       return;
+                       }
+               }
+               Element *topelement=element.last();
+               uint topindex=index.last();
+               switch(topelement->type) {
+               case ELEMSET:
+               case ELEMCONST:
+                       return;
+               case ELEMFUNCRETURN: {
+                       ElementFunction * func=(ElementFunction*) topelement;
+                       uint size=func->inputs.getSize();
+                       if (topindex == size)
+                               return;
+                       index.pop();
+                       index.push(topindex+1);
+                       Element *newchild=func->inputs.get(topindex);
+                       if (discovered.add(newchild)) {
+                               element.push(newchild);
+                               index.push(0);
+                       }
+                       break;
+               }
+               default:
+                       ASSERT(0);
+               }
+       }
+}
+
+Element * ElementIterator::next() {
+       Element * e = element.last();
+       updateNext();
+       return e;
+}

diff --git a/src/AST/iterator.h b/src/AST/iterator.h
index b82ee37ee2c8dc0cf357ef5972b906b485714a20..0e7303f7bc374481233f11cad41f2b81571c1ce8 100644 (file)
--- a/src/AST/iterator.h
+++ b/src/AST/iterator.h
@@ -10,6 +10,7 @@ class BooleanIterator {
        bool hasNext();
        Boolean * next();
        CMEMALLOC;
+
  private:
        SetIteratorBooleanEdge * solverit;
        HashsetBoolean discovered;
@@ -20,10 +21,22 @@ class BooleanIterator {
 
 class ElementIterator {
  public:
+       ElementIterator(CSolver *_solver);
+       ~ElementIterator();
+       bool hasNext();
+       Element * next();
        CMEMALLOC;
+
  private:
        BooleanIterator bit;
-};
+       BooleanPredicate *base;
+       uint baseindex;
 
+       HashsetElement discovered;
+
+       Vector<Element *> element;
+       Vector<uint> index;
+       void updateNext();
+};
 
 #endif

diff --git a/src/ASTTransform/preprocess.cc b/src/ASTTransform/preprocess.cc
index a23d918e600833b534187f84f08fc60d1ac1201d..1e04fd096470f2147727d4ae8d021cf3e57f52e0 100644 (file)
--- a/src/ASTTransform/preprocess.cc
+++ b/src/ASTTransform/preprocess.cc
@@ -5,7 +5,7 @@
 #include "iterator.h"
 
 Preprocess::Preprocess(CSolver *_solver)
-        : Transform(_solver)
+       : Transform(_solver)
 {
 }
 

diff --git a/src/ASTTransform/preprocess.h b/src/ASTTransform/preprocess.h
index 1272266b6da26a4193221b85ecaa4ae2cc2f616f..ea9800d8e2b035b426c99e095b30af0485dbcfe5 100644 (file)
--- a/src/ASTTransform/preprocess.h
+++ b/src/ASTTransform/preprocess.h
@@ -4,16 +4,16 @@
 #include "transform.h"
 
 class Preprocess : public Transform {
-       public:
-        Preprocess(CSolver *_solver);
-        ~Preprocess();
-        void doTransform();
-
-        CMEMALLOC;
-private:
-                               HashsetBoolean toremove;
-                               void processBooleanVar(BooleanVar * b);
-                               void resolveBooleanVars();
+ public:
+       Preprocess(CSolver *_solver);
+       ~Preprocess();
+       void doTransform();
+       
+       CMEMALLOC;
+ private:
+       HashsetBoolean toremove;
+       void processBooleanVar(BooleanVar * b);
+       void resolveBooleanVars();
 };
 
 #endif

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index 801cb8784e6bcabd66e1984adfdf4a4067b4d452..e6f451ed3d6ba0f0b9997104ac2c5f3dad40b698 100644 (file)
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@ -24,6 +24,7 @@ typedef Hashset<OrderNode *, uintptr_t, PTRSHIFT, order_node_hash_function, orde
 typedef Hashset<OrderEdge *, uintptr_t, PTRSHIFT, order_edge_hash_function, order_edge_equals> HashsetOrderEdge;
 typedef Hashset<OrderElement *, uintptr_t, PTRSHIFT, order_element_hash_function, order_element_equals> HashsetOrderElement;
 typedef Hashset<Boolean *, uintptr_t, PTRSHIFT> HashsetBoolean;
+typedef Hashset<Element *, uintptr_t, PTRSHIFT> HashsetElement;
 typedef SetIterator<Boolean *, uintptr_t, PTRSHIFT> SetIteratorBoolean;
 
 typedef Hashtable<OrderNode *, HashsetOrderNode *, uintptr_t, PTRSHIFT> HashtableNodeToNodeSet;