Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into...

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/AST/set.cc b/src/AST/set.cc
index bd1b3d6e431f013a32ce4bc43123c22bcb68c775..d3801f8d498eb98e3a55440a4ac7faf243a195f3 100644 (file)
--- a/src/AST/set.cc
+++ b/src/AST/set.cc
@@ -40,12 +40,12 @@ bool Set::exists(uint64_t element) {
                        uint middle=(low+high)/2;
                        uint64_t val=members->get(middle);
                        if (element < val) {
-                               high=middle;
-                               if (middle==low)
+                               high=middle-1;
+                               if (middle<=low)
                                        return false;
                        } else if (element > val) {
-                               low=middle;
-                               if (middle==high)
+                               low=middle+1;
+                               if (middle>=high)
                                        return false;
                        } else {
                                return true;

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.cc b/src/ASTAnalyses/Encoding/encodinggraph.cc
index 9231ad6054eeaefef6828445ca92b49bbb83b8f4..658997604338d0a4e5d35074b7a7768601a8a479 100644 (file)
--- a/src/ASTAnalyses/Encoding/encodinggraph.cc
+++ b/src/ASTAnalyses/Encoding/encodinggraph.cc
@@ -63,13 +63,16 @@ 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) {
                                        encoding->encodingArrayInitialization();
                                } else if (encodetype == BINARYINDEX) {
                                        EncodingSubGraph * subgraph = graphMap.get(n);
+                                       if (subgraph == NULL)
+                                               continue;
                                        uint encodingSize = subgraph->getEncodingSize(n);
                                        uint paddedSize = encoding->getSizeEncodingArray(encodingSize);
                                        encoding->allocInUseArrayElement(paddedSize);