/*
-/*
+*
** constraintResolve.c
*/
+//#define DEBUGPRINT 1
+
# include <ctype.h> /* for isdigit */
# include "lclintMacros.nf"
# include "basic.h"
# include "exprChecks.h"
# include "aliasChecks.h"
# include "exprNodeSList.h"
-# include "exprData.i"
+//# include "exprData.i"
+#include "constraintExpr.h"
-int constraintExpr_getValue (constraintExpr expr)
-{
- if (expr->expr != NULL)
- {
- TPRINTF( ( "Not Implemented" ));
- llassert(FALSE);
- }
- return (constraintTerm_getValue (expr->term) );
-}
-// returns 1 0 -1 like strcopy
-int constraintExpr_compare (constraintExpr expr1, constraintExpr expr2)
-{
- int value1, value2;
- value1 = constraintExpr_getValue(expr1);
- value2 = constraintExpr_getValue(expr2);
+constraintList reflectChanges (constraintList pre2, constraintList post1);
+constraint substitute (constraint c, constraintList p);
+constraint constraint_searchandreplace (constraint c, constraintExpr old, constraintExpr new);
+bool rangeCheck (arithType ar1, constraintExpr expr1, arithType ar2, constraintExpr expr2);
+bool satifies (constraint pre, constraint post);
+bool resolve (constraint c, constraintList p);
+constraintList reflectChangesEnsures (constraintList pre2, constraintList post1);
+constraint constraint_simplify (constraint c);
- if (value1 > value2)
- return 1;
+constraintList constraintList_fixConflicts (constraintList list1, constraintList list2);
- if (value1 == value2)
- return 0;
+constraintList constraintList_subsumeEnsures (constraintList list1, constraintList list2);
- else
- return -1;
+constraintList constraintList_mergeEnsures (constraintList list1, constraintList list2);
+constraint inequalitySubstitute (constraint c, constraintList p);
+
+/*********************************************/
+
+
+constraintList constraintList_mergeEnsures (constraintList list1, constraintList list2)
+{
+ constraintList ret;
+ constraintList temp;
+ ret = constraintList_new();
+
+ ret = reflectChangesEnsures (list1, list2);
+ ret = constraintList_fixConflicts (ret, list2);
+ ret = constraintList_subsumeEnsures (ret, list2);
+ list2 = constraintList_subsumeEnsures (list2, ret);
+ temp = constraintList_copy(list2);
+
+ temp = constraintList_addList (temp, ret);
+ return temp;
+ //ret = constraintList_addList (ret, list2);
+ //return ret;
}
-bool constraintExpr_canCompare (constraintExpr expr1, constraintExpr expr2)
+
+/* constraintList constraintList_resolveRequires (constraintList requires, constraintList ensures) */
+/* { */
+
+/* constraintList ret; */
+/* constraintList temp; */
+/* ret = constraintList_new(); */
+
+/* ret = reflectChangesEnsures (list1, list2); */
+/* ret = constraintList_fixConflicts (ret, list2); */
+/* ret = constraintList_subsumeEnsures (ret, list2); */
+/* list2 = constraintList_subsumeEnsures (list2, ret); */
+/* temp = constraintList_copy(list2); */
+
+/* temp = constraintList_addList (temp, ret); */
+/* return temp; */
+/* //ret = constraintList_addList (ret, list2); */
+/* //return ret; */
+/* } */
+
+
+constraintList checkCall (exprNode fcn, exprNodeList arglist)
{
- if (expr1->expr != NULL)
+ constraintList preconditions;
+ uentry temp;
+ DPRINTF ( (message ("Got call that %s ( %s) ", exprNode_unparse(fcn), exprNodeList_unparse (arglist ) ) ) );
+
+ temp = exprNode_getUentry (fcn);
+
+ preconditions = uentry_getFcnPreconditions (temp);
+
+ if (preconditions)
{
- return FALSE;
+ preconditions = constraintList_copy(preconditions);
+ preconditions = constraintList_doSRefFixBaseParam (preconditions, arglist);
}
-
- if (expr2->expr != NULL)
+ else
{
- return FALSE;
+ preconditions = constraintList_new();
}
-
- return TRUE;
+
+ return preconditions;
}
-bool rangeCheck (arithType ar1, constraintExpr expr1, arithType ar2, constraintExpr expr2)
-
+void mergeResolve (exprNode parent, exprNode child1, exprNode child2)
{
- switch (ar1)
- {
- case GTE:
- case GT:
- /*irst constraint is > only > => or == cosntraint can satify it */
- if ( (ar2 == GT) || (ar2 == GTE) || (ar2 == EQ) )
- {
- if (! constraintExpr_canCompare (expr1, expr2) )
- return FALSE;
-
- if (constraintExpr_compare (expr2, expr1) >= 0)
- return TRUE;
-
- }
- return FALSE;
- default:
- TPRINTF(("case not handled"));
- }
- return FALSE;
+ constraintList temp;
+
+ DPRINTF( (message ("magically merging constraint into parent:%s for", exprNode_unparse (parent) )));
+
+ DPRINTF( (message (" children: %s and %s", exprNode_unparse (child1), exprNode_unparse(child2) ) ) );
+
+ if (exprNode_isError (child1) || exprNode_isError(child2) )
+ {
+ if (exprNode_isError (child1) && !exprNode_isError(child2) )
+ {
+ parent->requiresConstraints = constraintList_copy (child2->requiresConstraints);
+ parent->ensuresConstraints = constraintList_copy (child2->ensuresConstraints);
+ DPRINTF((message ("Copied child constraints: pre: %s and post: %s",
+ constraintList_print( child2->requiresConstraints),
+ constraintList_print (child2->ensuresConstraints)
+ )
+ ));
+ return;
+ }
+ else
+ {
+ llassert(exprNode_isError(child2) );
+ parent->requiresConstraints = constraintList_new();
+ parent->ensuresConstraints = constraintList_new();
+ return;
+ }
+ }
+
+ llassert(!exprNode_isError (child1) && ! exprNode_isError(child2) );
+
+ DPRINTF( (message ("Child constraints are %s %s and %s %s",
+ constraintList_print (child1->requiresConstraints),
+ constraintList_print (child1->ensuresConstraints),
+ constraintList_print (child2->requiresConstraints),
+ constraintList_print (child2->ensuresConstraints)
+ ) ) );
+
+ parent->requiresConstraints = constraintList_new();
+ parent->ensuresConstraints = constraintList_new();
+
+ parent->requiresConstraints = constraintList_copy (child1->requiresConstraints);
+
+ temp = reflectChanges (child2->requiresConstraints, child1->ensuresConstraints);
+ parent->requiresConstraints = constraintList_addList (parent->requiresConstraints, temp);
+
+ parent->ensuresConstraints = constraintList_mergeEnsures(child1->ensuresConstraints,
+ child2->ensuresConstraints);
+
+ DPRINTF( (message ("Parent constraints are %s and %s ",
+ constraintList_print (parent->requiresConstraints),
+ constraintList_print (parent->ensuresConstraints)
+ ) ) );
+
}
-/*returns true if cosntraint post satifies cosntriant pre */
-bool satifies (constraint pre, constraint post)
+
+
+
+constraintList constraintList_subsumeEnsures (constraintList list1, constraintList list2)
{
- if (!constraintTerm_same(pre->lexpr->term, post->lexpr->term) )
+ constraintList ret;
+ ret = constraintList_new();
+ constraintList_elements (list1, el)
{
- return FALSE;
- }
- if (post->expr == NULL)
- return FALSE;
+
+ DPRINTF ((message ("Examining %s", constraint_print (el) ) ) );
+ if (!resolve (el, list2) )
+ {
+ ret = constraintList_add (ret, el);
+ }
+ else
+ {
+ DPRINTF ( (message ("Subsuming %s", constraint_print (el) ) ) );
+ }
+ } end_constraintList_elements;
- return rangeCheck (pre->ar, pre->expr, post->ar, post->expr);
+ return ret;
}
-constraintExpr constraintExpr_simplify (constraintExpr expr)
+
+constraintList reflectChanges (constraintList pre2, constraintList post1)
{
- expr->term = constraintTerm_simplify (expr->term);
- if (expr->expr == NULL)
+ constraintList ret;
+ constraint temp;
+ ret = constraintList_new();
+ constraintList_elements (pre2, el)
{
- if ( (expr->term->kind == CONSTRAINTEXPR) && (expr->term->constrType == VALUE) )
+ if (!resolve (el, post1) )
{
- expr->op = expr->term->value.constrExpr->op;
- expr->expr = expr->term->value.constrExpr->expr;
- expr->term = expr->term->value.constrExpr->term;
+ temp = substitute (el, post1);
+ if (!resolve (temp, post1) )
+ {
+ // try inequality substitution
+ constraint temp2;
+
+ // the inequality substitution may cause us to lose information
+ //so we don't want to store the result but we do it anyway
+ temp2 = constraint_copy (temp);
+ temp2 = inequalitySubstitute (temp, post1);
+ if (!resolve (temp2, post1) )
+ ret = constraintList_add (ret, temp2);
+ }
}
-
- return expr;
- }
-
- expr->expr = constraintExpr_simplify (expr->expr);
+ } end_constraintList_elements;
-
-
- if ( (expr->term->kind == INTLITERAL) && (expr->expr->term->kind == INTLITERAL) )
- {
- DPRINTF( ("INTLITERAL MERGE " ));
+ return ret;
+}
- DPRINTF ( (message ("Expression is %s ", constraintExpr_print (expr) ) ) );
-
- if (expr->op == PLUS )
+
+
+constraintList reflectChangesEnsures (constraintList pre2, constraintList post1)
+{
+ constraintList ret;
+ constraint temp;
+ ret = constraintList_new();
+ constraintList_elements (pre2, el)
+ {
+ if (!resolve (el, post1) )
{
- DPRINTF( (message ("Adding %d and %d ", expr->term->value.intlit,
- expr->expr->term->value.intlit) ) );
- expr->term->value.intlit += expr->expr->term->value.intlit;
+ temp = substitute (el, post1);
+ llassert (temp != NULL);
+
+ if (!resolve (temp, post1) )
+ ret = constraintList_add (ret, temp);
}
- else if (expr->op == MINUS )
+ else
{
- expr->term->value.intlit -= expr->expr->term->value.intlit;
+ DPRINTF ( (message ("Resolved away %s ", constraint_print(el) ) ) );
}
- expr->op = expr->expr->op;
+ } end_constraintList_elements;
- expr->expr = expr->expr->expr;
- }
-
- return expr;
-
+ return ret;
}
-constraintExpr constraintExpr_add (constraintExpr e, constraintTerm term, constraintExprOp op)
-{
- constraintExpr p;
- p = e;
- while (p->expr != NULL)
+bool constraint_conflict (constraint c1, constraint c2)
+{
+
+ if (constraintExpr_similar(c1->lexpr, c2->lexpr) )
{
- p = p->expr;
- }
+ if (c1->ar == EQ)
+ if (c1->ar == c2->ar)
+ {
+ DPRINTF ( (message ("%s conflicts with %s ", constraint_print (c1), constraint_print(c2) ) ) );
+ return TRUE;
+ }
+ }
- p->op = op;
- p->expr = constraintExpr_alloc();
- p->expr->term = term;
+ DPRINTF ( (message ("%s doesn't conflict with %s ", constraint_print (c1), constraint_print(c2) ) ) );
- return e;
-}
+ return FALSE;
-constraintExpr termMove (constraintExpr dst, constraintExpr src)
-{
- constraintTerm term;
- llassert (src->expr != NULL);
- term = src->expr->term;
- if (src->op == PLUS)
- dst = constraintExpr_add (dst, term, MINUS);
- else
- if (src->op == MINUS)
- dst = constraintExpr_add (dst, term, PLUS);
-
- return dst;
}
-constraint solveforterm (constraint c)
+void constraint_fixConflict (constraint good, constraint conflicting)
{
- constraintExpr p;
- p = c->lexpr;
- while (p->expr != NULL)
- {
- DPRINTF( (message("Moving %s", constraintExpr_print (c->expr) ) ) );
- c->expr = termMove(c->expr, p);
- p->op = p->expr->op;
- #warning memleak
+ constraint temp;
+ if (conflicting->ar ==EQ )
+ {
+ good->expr = constraintExpr_searchandreplace (good->expr, conflicting->lexpr, conflicting->expr);
+ temp = constraint_simplify (good);
+ constraint_overWrite (good, temp);
+ }
+
- p->expr = p->expr->expr;
- }
- return c;
}
-constraint solveforOther (constraint c)
+bool conflict (constraint c, constraintList list)
{
- constraintExpr p;
- p = c->expr;
- while (p->expr != NULL)
- {
- TPRINTF( (message("Moving %s", constraintExpr_print (c->expr) ) ) );
- c->lexpr = termMove(c->lexpr, p);
- p->op = p->expr->op;
- #warning memleak
+
+ constraintList_elements (list, el)
+ {
+ if ( constraint_conflict(el, c) )
+ {
+ constraint_fixConflict (el, c);
+ return TRUE;
+ }
+ } end_constraintList_elements;
+
+ return FALSE;
+
- p->expr = p->expr->expr;
- }
- return c;
}
-constraint constraint_simplify (constraint c)
+//check if constraint in list1 and conflict with constraints in List2. If so we
+//remove form list1 and (optionally) change list2.
+constraintList constraintList_fixConflicts (constraintList list1, constraintList list2)
{
- c = solveforterm (c);
- c->lexpr = constraintExpr_simplify (c->lexpr);
- c->expr = constraintExpr_simplify (c->expr);
- return c;
+ constraintList ret;
+ ret = constraintList_new();
+ constraintList_elements (list1, el)
+ {
+ if (! conflict (el, list2) )
+ {
+ ret = constraintList_add (ret, el);
+ }
+ } end_constraintList_elements;
+
+ return ret;
+
+
}
bool resolve (constraint c, constraintList p)
}
-constraintTerm constraintTerm_substituteTerm (constraintTerm term, constraintTerm oldterm, constraintExpr replacement)
+/*returns true if cosntraint post satifies cosntriant pre */
+bool satifies (constraint pre, constraint post)
{
- if ( constraintTerm_similar (term, oldterm) )
+ if (!constraintExpr_similar (pre->lexpr, post->lexpr) )
+ {
+ return FALSE;
+ }
+ if (post->expr == NULL)
{
- // do the substitution
- term->kind = CONSTRAINTEXPR;
- term->value.constrExpr = constraintExpr_copy (replacement);
+ llassert(FALSE);
+ return FALSE;
}
- return term;
+
+ return rangeCheck (pre->ar, pre->expr, post->ar, post->expr);
}
-constraintExpr constraintExpr_substituteTerm (constraintExpr expr, constraintTerm oldterm, constraintExpr replacement)
+bool arithType_canResolve (arithType ar1, arithType ar2)
{
- expr->term = constraintTerm_substituteTerm (expr->term, oldterm, replacement);
- if (expr->expr != NULL)
- expr->expr = constraintExpr_substituteTerm (expr->expr, oldterm, replacement);
+ switch (ar1)
+ {
+ case GTE:
+ case GT:
+ if ( (ar2 == GT) || (ar2 == GTE) || (ar2 == EQ) )
+ {
+ return TRUE;
+ }
+ break;
+
+ case EQ:
+ if (ar2 == EQ)
+ return TRUE;
+ break;
- return expr;
+ case LT:
+ case LTE:
+ // llassert(FALSE);
+ if ( (ar2 == LT) || (ar2 == LTE) || (ar2 == EQ) )
+ return TRUE;
+ }
+ return FALSE;
}
-/* returns true if fileloc for term2 is closer to file for term1 than is term3*/
+bool rangeCheck (arithType ar1, constraintExpr expr1, arithType ar2, constraintExpr expr2)
-bool fileloc_closer (constraintTerm term1, constraintTerm term2, constraintTerm term3)
{
- if ( fileloc_lessthan (term1->loc, term2->loc) )
- {
- if (fileloc_lessthan (term2->loc, term3->loc) )
- {
- llassert (fileloc_lessthan (term1->loc, term3->loc) );
- return TRUE;
- }
- else
- {
- return FALSE;
- }
- }
+ DPRINTF ((message ("Doing Range CHECK %s and %s", constraintExpr_unparse(expr1), constraintExpr_unparse(expr2) ) ));
- if ( ! (fileloc_lessthan (term1->loc, term2->loc) ) )
+ if (! arithType_canResolve (ar1, ar2) )
+ return FALSE;
+
+ switch (ar1)
+ {
+ case GTE:
+ case GT:
+ if (! (constraintExpr_canGetValue (expr1) &&
+ constraintExpr_canGetValue (expr2) ) )
{
- if (!fileloc_lessthan (term2->loc, term3->loc) )
- {
- llassert (fileloc_lessthan (term3->loc, term1->loc) );
- return TRUE;
- }
- else
- {
- return FALSE;
-
- }
+ DPRINTF( ("Can't Get value"));
+ return FALSE;
}
-
- llassert(FALSE);
+
+ if (constraintExpr_compare (expr2, expr1) >= 0)
+ return TRUE;
+
+ return FALSE;
+ case EQ:
+ if (constraintExpr_similar (expr1, expr2) )
+ return TRUE;
+
return FALSE;
+
+ default:
+ DPRINTF(("case not handled"));
+ }
+ return FALSE;
}
-constraint constraint_substituteTerm (constraint c, constraint subs)
+
+constraint constraint_searchandreplace (constraint c, constraintExpr old, constraintExpr new)
{
- constraintTerm oldterm;
- constraintExpr replacement;
-
- llassert(subs->lexpr->expr == NULL);
-
+ DPRINTF (("Doing replace for lexpr") );
+ c->lexpr = constraintExpr_searchandreplace (c->lexpr, old, new);
+ DPRINTF (("Doing replace for expr") );
+ c->expr = constraintExpr_searchandreplace (c->expr, old, new);
+ return c;
+}
- oldterm = subs->lexpr->term;
- replacement = subs->expr;
-
- // Chessy hack assumes that subs always has the form g:1 = g:2 + expr
+bool constraint_search (constraint c, constraintExpr old)
+{
+ bool ret;
+ ret = FALSE;
- /*@i2*/
-
- /*find out which value to substitute*/
- TPRINTF((message ("doing substitute for %s and %s", constraint_print (c), constraint_print(subs) ) ) );
- if ( constraintExpr_containsTerm (subs->expr, subs->lexpr->term) )
+ ret = constraintExpr_search (c->lexpr, old);
+ ret = ret || constraintExpr_search (c->expr, old);
+ return ret;
+}
+
+//adjust file locs and stuff
+constraint constraint_adjust (constraint substitute, constraint old)
+{
+ fileloc loc1, loc2, loc3;
+
+ DPRINTF ( (message("Start adjust on %s and %s", constraint_print(substitute),
+ constraint_print(old))
+ ));
+
+ loc1 = constraint_getFileloc (old);
+
+ loc2 = constraintExpr_getFileloc (substitute->lexpr);
+
+ loc3 = constraintExpr_getFileloc (substitute->expr);
+
+
+ // special case of an equality that "contains itself"
+ if (constraintExpr_search (substitute->expr, substitute->lexpr) )
+ if (fileloc_closer (loc1, loc3, loc2))
{
- TPRINTF(("doing new stuff"));
- if (fileloc_closer (c->lexpr->term, subs->expr->term, subs->lexpr->term) )
- {
- // use the other term
- constraint new;
- new = constraint_copy (subs);
- new = solveforOther(new);
- oldterm = new->expr->term;
- replacement = new->lexpr;
- }
+ constraintExpr temp;
+ DPRINTF ( (message("Doing adjust on %s", constraint_print(substitute) )
+ ));
+ temp = substitute->lexpr;
+ substitute->lexpr = substitute->expr;
+ substitute->expr = temp;
+ substitute = constraint_simplify(substitute);
}
- c->lexpr = constraintExpr_substituteTerm (c->lexpr, oldterm, replacement);
- c->expr = constraintExpr_substituteTerm (c->expr, oldterm, replacement);
- return c;
+ return substitute;
+
}
-constraint substitute (constraint c, constraintList p)
+constraint inequalitySubstitute (constraint c, constraintList p)
{
+ if (c->ar != GTE)
+ return c;
+
constraintList_elements (p, el)
{
- if ( el->ar == EQ)
- if (constraint_hasTerm (c, el->lexpr->term) )
- {
- llassert(el->lexpr->expr == NULL);
- DPRINTF((message ("doing substitute for %s", constraint_print (c) ) ) );
-
- c = constraint_substituteTerm (c, el);
- DPRINTF((message ("substituted constraint is now %s", constraint_print (c) ) ) );
- // c->lexpr = constraintExpr_copy (el->expr);
- c = constraint_simplify(c);
- c = constraint_simplify(c);
- c = constraint_simplify(c);
- return c;
- }
+ if ( el->ar == LT)
+ // if (!constraint_conflict (c, el) )
+ {
+ constraint temp;
+ temp = constraint_copy(el);
+
+ // temp = constraint_adjust(temp, c);
+
+ if (constraintExpr_same (el->lexpr, c->expr) )
+ {
+ DPRINTF((message ("Replacing %s in %s with %s",
+ constraintExpr_print (c->expr),
+ constraint_print (c),
+ constraintExpr_print (el->expr) )
+ ));
+ c->expr = constraintExpr_copy (el->expr);
+ }
+
+ }
}
end_constraintList_elements;
return c;
}
-
-constraintList reflectChanges (constraintList pre2, constraintList post1)
-{
-
- constraintList ret;
- constraint temp;
- ret = constraintList_new();
- constraintList_elements (pre2, el)
- {
- if (!resolve (el, post1) )
- {
- temp = substitute (el, post1);
- ret = constraintList_add (ret, temp);
- }
- } end_constraintList_elements;
-
- return ret;
-}
-
-bool constraintExpr_containsTerm (constraintExpr p, constraintTerm term)
+constraint substitute (constraint c, constraintList p)
{
- TPRINTF(("constraintExpr_containsTerm"));
-
- while (p != NULL)
+ constraintList_elements (p, el)
{
- if (constraintTerm_similar (p->term, term) )
- return TRUE;
-
- p = p->expr->expr;
+ if ( el->ar == EQ)
+ if (!constraint_conflict (c, el) )
+
+ {
+ constraint temp;
+ temp = constraint_copy(el);
+
+ temp = constraint_adjust(temp, c);
+
+ DPRINTF((message ("Substituting %s for %s",
+ constraint_print (temp), constraint_print (c)
+ ) ) );
+
+
+ c = constraint_searchandreplace (c, temp->lexpr, temp->expr);
+ }
}
- DPRINTF((
- message ("constraintExpr_hasTerm returned fallse for %s %S",
- constraint_print(c), constraintTerm_print(term)
- )
- ));
- return FALSE;
+ end_constraintList_elements;
+
+ c = constraint_simplify(c);
+ return c;
}
-/*check if rvalue side has term*/
-bool constraintExpr_hasTerm (constraint c, constraintTerm term)
+constraint constraint_solve (constraint c)
{
- constraintExpr p;
- p = c->expr;
- while (p != NULL)
- {
- if (constraintTerm_same (p->term, term) )
- return TRUE;
+ DPRINTF( (message ("Solving %s\n", constraint_print(c) ) ) );
+ c->expr = constraintExpr_solveBinaryExpr (c->lexpr, c->expr);
+ DPRINTF( (message ("Solved and got %s\n", constraint_print(c) ) ) );
- p = p->expr->expr;
- }
- DPRINTF((
- message ("constraintExpr_hasTerm returned fallse for %s %S",
- constraint_print(c), constraintTerm_print(term)
- )
- ));
- return FALSE;
+ return c;
}
-constraintExpr solveEq (constraint c, constraintTerm t)
-{
- constraintExpr p;
- c = constraint_copy (c);
- DPRINTF(("\ndoing solveEq\n"));
- if (! constraintTerm_same (c->expr->term, t) )
- {
- DPRINTF ( (message ("\n\nconstraintTerms: %s %s not same ", constraintTerm_print(c->expr->term),
- constraintTerm_print(t) )
- ) );
- return NULL;
- }
- p = c->expr;
- while (p->expr != NULL)
- {
- DPRINTF( (message("\n\nMoving %s", constraintExpr_print (c->expr) ) ) );
- c->lexpr = termMove(c->lexpr, p);
- p->expr = p->expr->expr;
- }
+constraint constraint_simplify (constraint c)
+{
+ c->lexpr = constraintExpr_simplify (c->lexpr);
+ c->expr = constraintExpr_simplify (c->expr);
- return c->lexpr;
+ c = constraint_solve (c);
-}
-
-constraint updateConstraint (constraint c, constraintList p)
-{
- TPRINTF(("start updateConstraints"));
- constraintList_elements (p, el)
- {
-
- if (constraintTerm_same(c->lexpr->term, el->lexpr->term) )
- {
- TPRINTF((""));
- if ( el->ar == EQ)
- {
- TPRINTF(("j"));
-
- if (constraintExpr_hasTerm (el, c->lexpr->term) )
- {
- constraintExpr solve;
- TPRINTF((""));
- solve = solveEq (el, c->lexpr->term);
- if (solve)
- {
- c->lexpr = constraintExpr_copy (solve);
- c = constraint_simplify(c);
- return c;
- }
- }
- }
- }
- }
- end_constraintList_elements;
- c = constraint_simplify(c);
+ c->lexpr = constraintExpr_simplify (c->lexpr);
+ c->expr = constraintExpr_simplify (c->expr);
- DPRINTF(("end updateConstraints"));
return c;
}
-constraintList reflectChangesEnsures (constraintList pre2, constraintList post1)
-{
- constraintList ret;
- constraint temp;
- ret = constraintList_new();
- constraintList_elements (pre2, el)
- {
- if (!resolve (el, post1) )
- {
- temp = substitute (el, post1);
- if (temp != NULL)
- ret = constraintList_add (ret, temp);
- }
- } end_constraintList_elements;
- return ret;
-}
-void mergeResolve (exprNode parent, exprNode child1, exprNode child2)
+/* returns true if fileloc for term1 is closer to file for term2 than term3*/
+
+bool fileloc_closer (fileloc loc1, fileloc loc2, fileloc loc3)
{
- constraintList temp;
- DPRINTF( (message ("magically merging constraint into parent:%s for children: %s and %s", exprNode_unparse (parent), exprNode_unparse (child1), exprNode_unparse(child2) )
- ) );
- if (exprNode_isError (child1) || exprNode_isError(child2) )
+ if ( fileloc_lessthan (loc1, loc2) )
{
- if (exprNode_isError (child1) && !exprNode_isError(child2) )
+ if (fileloc_lessthan (loc2, loc3) )
{
- parent->requiresConstraints = constraintList_copy (child2->requiresConstraints);
- parent->ensuresConstraints = constraintList_copy (child2->ensuresConstraints);
- DPRINTF((message ("Copied child constraints: pre: %s and post: %s",
- constraintList_print( child2->requiresConstraints),
- constraintList_print (child2->ensuresConstraints)
- )
- ));
- return;
+ llassert (fileloc_lessthan (loc1, loc3) );
+ return TRUE;
}
else
{
- llassert(exprNode_isError(child2) );
- parent->requiresConstraints = constraintList_new();
- parent->ensuresConstraints = constraintList_new();
- return;
+ return FALSE;
}
}
- llassert(!exprNode_isError (child1) && ! exprNode_isError(child2) );
-
- DPRINTF( (message ("Child constraints are %s %s and %s %s",
- constraintList_print (child1->requiresConstraints),
- constraintList_print (child1->ensuresConstraints),
- constraintList_print (child2->requiresConstraints),
- constraintList_print (child2->ensuresConstraints)
- ) ) );
-
- parent->requiresConstraints = constraintList_new();
- parent->ensuresConstraints = constraintList_new();
-
- parent->requiresConstraints = constraintList_copy (child1->requiresConstraints);
-
- temp = reflectChanges (child2->requiresConstraints, child1->ensuresConstraints);
- parent->requiresConstraints = constraintList_addList (parent->requiresConstraints, temp);
-
-
- temp = reflectChangesEnsures (child1->ensuresConstraints, child2->ensuresConstraints);
- // temp = constraintList_copy (child1->ensuresConstraints);
+ if ( !fileloc_lessthan (loc1, loc2) )
+ {
+ if (!fileloc_lessthan (loc2, loc3) )
+ {
+ llassert (!fileloc_lessthan (loc1, loc3) );
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+ }
-
- parent->ensuresConstraints = constraintList_copy (child2->ensuresConstraints);
- parent->ensuresConstraints = constraintList_addList (parent->ensuresConstraints, temp);
-
- DPRINTF( (message ("Parent constraints are %s and %s ",
- constraintList_print (parent->requiresConstraints),
- constraintList_print (parent->ensuresConstraints)
- ) ) );
-
+ llassert(FALSE);
+ return FALSE;
}