Merge branch 'hamed' into brian

[satune.git] / src / Backend / constraint.c

diff --git a/src/Backend/constraint.c b/src/Backend/constraint.c
index 1aa3d3cc9b5f22d90498dcbd0ad915b0e8ab928d..46c8c5effcd43c8ff1adc87b5fe294bd7dac69ce 100644 (file)
--- a/src/Backend/constraint.c
+++ b/src/Backend/constraint.c
@@ -63,6 +63,7 @@ Constraint * allocVarConstraint(CType t, uint v) {
 void deleteConstraint(Constraint *This) {
        if (This->operands!=NULL)
                ourfree(This->operands);
+       ourfree(This);
 }
 
 void dumpConstraint(Constraint * This, IncrementalSolver *solver) {
@@ -97,7 +98,7 @@ void internalfreeConstraint(Constraint * This) {
                ASSERT(0);
        default:
                This->type=BOGUS;
-               ourfree(This);
+               deleteConstraint(This);
        }
 }
 
@@ -159,6 +160,7 @@ void printConstraint(Constraint * This) {
                model_print("!t%u",This->numoperandsorvar);
                break;
        default:
+               model_print("In printingConstraint: %d", This->type);
                ASSERT(0);
        }
 }
@@ -186,7 +188,7 @@ Constraint * cloneConstraint(Constraint * This) {
        }
 }
 
-Constraint * generateConstraint(uint numvars, Constraint ** vars, uint value) {
+Constraint * generateBinaryConstraint(uint numvars, Constraint ** vars, uint value) {
        Constraint *carray[numvars];
        for(uint j=0;j<numvars;j++) {
                carray[j]=((value&1)==1) ? vars[j] : negateConstraint(vars[j]);