Bug fixes

diff --git a/src/AST/iterator.cc b/src/AST/iterator.cc
index 2a18889dc2ad39564b40df6fc7e9222874b5e3ce..2b0dea448fc8ac1f004052ee303bac8c1c7c1056 100644 (file)
--- a/src/AST/iterator.cc
+++ b/src/AST/iterator.cc
@@ -72,7 +72,7 @@ ElementIterator::ElementIterator(CSolver *_solver) :
        bit(_solver),
        base(NULL),
        baseindex(0) {
-       
+       updateNext();
 }
 
 ElementIterator::~ElementIterator() {
@@ -100,7 +100,8 @@ void ElementIterator::updateNext() {
                                        if (discovered.add(e)) {
                                                element.push(e);
                                                index.push(0);
-                                       }
+                                       } else
+                                               continue;
                                }
                        } else {
                                if (bit.hasNext()) {

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.cc b/src/ASTAnalyses/Encoding/encodinggraph.cc
index 9231ad6054eeaefef6828445ca92b49bbb83b8f4..28255ec7f978b1a588dfa39e93c3d4b7376dc0ea 100644 (file)
--- a/src/ASTAnalyses/Encoding/encodinggraph.cc
+++ b/src/ASTAnalyses/Encoding/encodinggraph.cc
@@ -63,7 +63,8 @@ void EncodingGraph::encode() {
                        ElementEncoding *encoding=e->getElementEncoding();
                        if (encoding->getElementEncodingType() == ELEM_UNASSIGNED) {
                                EncodingNode *n = getNode(e);
-                               ASSERT(n != NULL);
+                               if (n == NULL)
+                                       continue;
                                ElementEncodingType encodetype=n->getEncoding();
                                encoding->setElementEncodingType(encodetype);
                                if (encodetype == UNARY || encodetype == ONEHOT) {