From: evans1629 Date: Sat, 29 Mar 2003 17:26:15 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: splint-3_1_0~29 X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/9a48d98c204aab98e0cd2d427808654cf280b62e *** empty log message *** --- diff --git a/src/constraint.c b/src/constraint.c index 5109339..fe7b638 100644 --- a/src/constraint.c +++ b/src/constraint.c @@ -38,8 +38,7 @@ # include "exprNodeSList.h" -static /*@only@*/ cstring constraint_printDetailedPostCondition (/*@observer@*/ /*@temp@*/ constraint p_c); - +static /*@only@*/ cstring constraint_unparseDetailedPostCondition (/*@observer@*/ /*@temp@*/ constraint p_c); static /*@notnull@*/ /*@special@*/ constraint constraint_makeNew (void) /*@post:isnull result->or, result->orig, result->generatingExpr, result->fcnPre @*/ @@ -79,7 +78,7 @@ static constraint makeConstraintParse2 (constraintExpr l, lltok relOp, exprNode ret->post = TRUE; DPRINTF (("GENERATED CONSTRAINT:")); - DPRINTF ((message ("%s", constraint_print (ret)))); + DPRINTF ((message ("%s", constraint_unparse (ret)))); return ret; } # endif @@ -140,7 +139,7 @@ constraint makeConstraintParse3 (constraintExpr l, lltok relOp, constraintExpr r /* ret->orig = ret; */ DPRINTF (("GENERATED CONSTRAINT:")); - DPRINTF ((message ("%s", constraint_print (ret)))); + DPRINTF ((message ("%s", constraint_unparse (ret)))); return ret; } @@ -183,8 +182,8 @@ void constraint_overWrite (constraint c1, constraint c2) llassert (c1 != c2); - DPRINTF ((message ("OverWriteing constraint %q with %q", constraint_print (c1), - constraint_print (c2)))); + DPRINTF ((message ("OverWriteing constraint %q with %q", constraint_unparse (c1), + constraint_unparse (c2)))); constraintExpr_free (c1->lexpr); constraintExpr_free (c1->expr); @@ -247,11 +246,11 @@ constraint constraint_addGeneratingExpr (/*@returned@*/ constraint c, /*@exposed if (c->generatingExpr == NULL) { c->generatingExpr = e; - DPRINTF ((message ("setting generatingExpr for %s to %s", constraint_print (c), exprNode_unparse (e)) )); + DPRINTF ((message ("setting generatingExpr for %s to %s", constraint_unparse (c), exprNode_unparse (e)) )); } else { - DPRINTF ((message ("Not setting generatingExpr for %s to %s", constraint_print (c), exprNode_unparse (e)) )); + DPRINTF ((message ("Not setting generatingExpr for %s to %s", constraint_unparse (c), exprNode_unparse (e)) )); } return c; } @@ -267,7 +266,7 @@ constraint constraint_origAddGeneratingExpr (/*@returned@*/ constraint c, exprNo } else { - DPRINTF ((message ("constraint_origAddGeneratingExpr: Not setting generatingExpr for %s to %s", constraint_print (c), exprNode_unparse (e)) )); + DPRINTF ((message ("constraint_origAddGeneratingExpr: Not setting generatingExpr for %s to %s", constraint_unparse (c), exprNode_unparse (e)) )); } return c; } @@ -676,7 +675,7 @@ void constraint_printErrorPostCondition (constraint c, fileloc loc) cstring string; fileloc errorLoc, temp; - string = constraint_printDetailedPostCondition (c); + string = constraint_unparseDetailedPostCondition (c); errorLoc = loc; @@ -708,7 +707,7 @@ cstring constraint_printLocation (/*@observer@*/ /*@temp@*/ constraint c) /*@*/ cstring string, ret; fileloc errorLoc; - string = constraint_print (c); + string = constraint_unparse (c); errorLoc = constraint_getFileloc (c); @@ -738,7 +737,7 @@ void constraint_printError (constraint c, fileloc loc) } - string = constraint_printDetailed (c); + string = constraint_unparseDetailed (c); errorLoc = loc; @@ -751,7 +750,7 @@ void constraint_printError (constraint c, fileloc loc) else { llassert (FALSE); - DPRINTF (("constraint %s had undefined fileloc %s", constraint_print (c), fileloc_unparse (temp))); + DPRINTF (("constraint %s had undefined fileloc %s", constraint_unparse (c), fileloc_unparse (temp))); fileloc_free (temp); errorLoc = fileloc_copy (errorLoc); } @@ -804,16 +803,13 @@ void constraint_printError (constraint c, fileloc loc) fileloc_free(errorLoc); } -static cstring constraint_printDeep (constraint c) +static cstring constraint_unparseDeep (constraint c) { cstring genExpr; - cstring st = cstring_undefined; - - - llassert (constraint_isDefined (c) ); - + cstring st; - st = constraint_print(c); + llassert (constraint_isDefined (c)); + st = constraint_unparse (c); if (c->orig != constraint_undefined) { @@ -825,18 +821,18 @@ static cstring constraint_printDeep (constraint c) if (c->orig->fcnPre) { st = cstring_concatFree (st, message (" derived from %s precondition: %q", - genExpr, constraint_printDeep (c->orig))); + genExpr, constraint_unparseDeep (c->orig))); } else { st = cstring_concatFree (st, message (" needed to satisfy precondition:\n%q", - constraint_printDeep (c->orig))); + constraint_unparseDeep (c->orig))); } } else { st = cstring_concatFree (st, message ("derived from: %q", - constraint_printDeep (c->orig))); + constraint_unparseDeep (c->orig))); } } @@ -844,15 +840,15 @@ static cstring constraint_printDeep (constraint c) } -static /*@only@*/ cstring constraint_printDetailedPostCondition (/*@observer@*/ /*@temp@*/ constraint c) +static /*@only@*/ cstring constraint_unparseDetailedPostCondition (/*@observer@*/ /*@temp@*/ constraint c) { cstring st = cstring_undefined; cstring genExpr; - llassert (constraint_isDefined (c) ); - st = message ("Unsatisfied ensures constraint condition:\nSplint is unable to verify the constraint %q", constraint_printDeep (c)); + st = message ("Unsatisfied ensures constraint condition:\nSplint is unable to verify the constraint %q", + constraint_unparseDeep (c)); genExpr = exprNode_unparse (c->generatingExpr); @@ -874,7 +870,7 @@ static /*@only@*/ cstring constraint_printDetailedPostCondition (/*@observer@*/ return st; } -cstring constraint_printDetailed (constraint c) +cstring constraint_unparseDetailed (constraint c) { cstring st = cstring_undefined; cstring temp = cstring_undefined; @@ -885,11 +881,11 @@ cstring constraint_printDetailed (constraint c) if (!c->post) { - st = message ("Unable to resolve constraint:\n%q", constraint_printDeep (c)); + st = message ("Unable to resolve constraint:\n%q", constraint_unparseDeep (c)); } else { - st = message ("Block Post condition:\nThis function block has the post condition %q", constraint_printDeep (c)); + st = message ("Block Post condition:\nThis function block has the post condition %q", constraint_unparseDeep (c)); } isLikely = constraint_isConstantOnly(c); @@ -932,7 +928,7 @@ cstring constraint_printDetailed (constraint c) return st; } -/*@only@*/ cstring constraint_print (constraint c) /*@*/ +/*@only@*/ cstring constraint_unparse (constraint c) /*@*/ { cstring st = cstring_undefined; cstring type = cstring_undefined; @@ -966,8 +962,7 @@ cstring constraint_printDetailed (constraint c) type, constraintExpr_print (c->lexpr), arithType_print (c->ar), - constraintExpr_print (c->expr) - ); + constraintExpr_print (c->expr)); } else { @@ -975,13 +970,12 @@ cstring constraint_printDetailed (constraint c) type, constraintExpr_print (c->lexpr), arithType_print (c->ar), - constraintExpr_print (c->expr) - ); + constraintExpr_print (c->expr)); } return st; } -cstring constraint_printOr (constraint c) /*@*/ +cstring constraint_unparseOr (constraint c) /*@*/ { cstring ret; constraint temp; @@ -992,14 +986,14 @@ cstring constraint_printOr (constraint c) /*@*/ temp = c; - ret = cstring_concatFree (ret, constraint_print (temp)); + ret = cstring_concatFree (ret, constraint_unparse (temp)); temp = temp->or; while ( constraint_isDefined (temp)) { ret = cstring_concatFree (ret, cstring_makeLiteral (" OR ")); - ret = cstring_concatFree (ret, constraint_print (temp)); + ret = cstring_concatFree (ret, constraint_unparse (temp)); temp = temp->or; } @@ -1064,19 +1058,16 @@ constraint constraint_doFixResult (constraint postcondition, /*@dependent@*/ exp constraint constraint_preserveOrig (/*@returned@*/ constraint c) /*@modifies c @*/ { + DPRINTF (("Doing constraint_preserverOrig for %q", constraint_printDetailed (c))); + llassert (constraint_isDefined (c)); - DPRINTF ((message ("Doing constraint_preserverOrig for %q ", constraint_printDetailed (c)))); - - llassert (constraint_isDefined (c) ); - if (c->orig == constraint_undefined) - c->orig = constraint_copy (c); - + { + c->orig = constraint_copy (c); + } else if (c->orig->fcnPre) { - constraint temp; - - temp = c->orig; + constraint temp = c->orig; /* avoid infinite loop */ c->orig = NULL; @@ -1099,69 +1090,53 @@ constraint constraint_preserveOrig (/*@returned@*/ constraint c) /*@modifies c @ } else { - DPRINTF ((message ("Not changing constraint"))); + DPRINTF (("Not changing constraint")); } - DPRINTF ((message ("After Doing constraint_preserverOrig for %q ", constraint_printDetailed (c)))); - + DPRINTF ((message ("After Doing constraint_preserverOrig for %q ", constraint_unparseDetailed (c)))); return c; } -/*@=fcnuse*/ -/*@=assignexpose*/ -/*@=czechfcns@*/ - constraint constraint_togglePost (/*@returned@*/ constraint c) { - llassert (constraint_isDefined (c) ); - + llassert (constraint_isDefined (c)); c->post = !c->post; return c; } constraint constraint_togglePostOrig (/*@returned@*/ constraint c) { - llassert (constraint_isDefined (c) ); + llassert (constraint_isDefined (c)); if (c->orig != NULL) - c->orig = constraint_togglePost (c->orig); + { + c->orig = constraint_togglePost (c->orig); + } + return c; } bool constraint_hasOrig ( /*@observer@*/ /*@temp@*/ constraint c) { - - llassert (constraint_isDefined (c) ); - - if (c->orig == NULL) - return FALSE; - else - return TRUE; + llassert (constraint_isDefined (c)); + return (c->orig != NULL); } constraint constraint_undump (FILE *f) { constraint c; - bool fcnPre; - bool post; - arithType ar; + bool fcnPre, post; + arithType ar; + constraintExpr lexpr, expr; + char *s, *os; - constraintExpr lexpr; - constraintExpr expr; - - - char * s; - - char *os; - os = mstring_create (MAX_DUMP_LINE_LENGTH); - s = fgets (os, MAX_DUMP_LINE_LENGTH, f); - if (! mstring_isDefined(s) ) + if (!mstring_isDefined (s)) { - llfatalbug(message("Library file is corrupted") ); + llfatalbug (message ("Library file is corrupted") ); } fcnPre = (bool) reader_getInt (&s); @@ -1169,7 +1144,7 @@ constraint constraint_undump (FILE *f) post = (bool) reader_getInt (&s); advanceField (&s); ar = (arithType) reader_getInt (&s); - + s = fgets (os, MAX_DUMP_LINE_LENGTH, f); if (! mstring_isDefined(s) ) @@ -1288,12 +1263,12 @@ static int constraint_getDepth (/*@observer@*/ /*@temp@*/ constraint c) if (l > r) { - DPRINTF (( message ("constraint depth returning %d for %s", l, constraint_print (c)))); + DPRINTF (( message ("constraint depth returning %d for %s", l, constraint_unparse (c)))); return l; } else { - DPRINTF (( message ("constraint depth returning %d for %s", r, constraint_print (c)))); + DPRINTF (( message ("constraint depth returning %d for %s", r, constraint_unparse (c)))); return r; } } diff --git a/src/constraintExpr.c b/src/constraintExpr.c index df1abb5..5ea57e0 100644 --- a/src/constraintExpr.c +++ b/src/constraintExpr.c @@ -1052,17 +1052,17 @@ bool constraintExpr_same (constraintExpr expr1, constraintExpr expr2) BADEXIT; } -bool constraintExpr_search (/*@observer@*/ constraintExpr c, /*@observer@*/ constraintExpr old) +bool +constraintExpr_search (/*@observer@*/ constraintExpr c, + /*@observer@*/ constraintExpr old) { bool ret = FALSE; constraintExprKind kind; constraintExpr temp; - if ( constraintExpr_similar (c, old) ) + if (constraintExpr_similar (c, old)) { - DPRINTF((message ("Found %q", - constraintExpr_unparse(old) - ))); + DPRINTF (("Found %q", constraintExpr_unparse (old))); return TRUE; } @@ -1543,11 +1543,11 @@ cstring constraintExpr_unparse (/*@temp@*/ /*@observer@*/ constraintExpr ex) /*@ if (context_getFlag (FLG_PARENCONSTRAINT) ) { - st = message ("(%q) ", constraintTerm_print (constraintExprData_termGetTerm (ex->data))); + st = message ("(%q) ", constraintTerm_unparse (constraintExprData_termGetTerm (ex->data))); } else { - st = message ("%q", constraintTerm_print (constraintExprData_termGetTerm (ex->data))); + st = message ("%q", constraintTerm_unparse (constraintExprData_termGetTerm (ex->data))); } break; case unaryExpr: @@ -1908,12 +1908,11 @@ doFixResultTerm (/*@only@*/ constraintExpr e, /*@exposed@*/ exprNode fcnCall) ret = e; switch (constraintTerm_getKind(t) ) { - case EXPRNODE: - break; - case INTLITERAL: + case CTT_EXPR: + case CTT_INTLITERAL: break; - case SREF: + case CTT_SREF: s = constraintTerm_getSRef(t); if (sRef_isResult (s)) { @@ -1957,21 +1956,21 @@ doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e, switch (constraintTerm_getKind(t)) { - case EXPRNODE: - DPRINTF((message ("%q @ %q ", constraintTerm_print(t), + case CTT_EXPR: + DPRINTF((message ("%q @ %q ", constraintTerm_unparse(t), fileloc_unparse (constraintTerm_getFileloc(t) ) ) )); break; - case INTLITERAL: - DPRINTF((message (" %q ", constraintTerm_print (t)) )); + case CTT_INTLITERAL: + DPRINTF((message (" %q ", constraintTerm_unparse (t)) )); break; - case SREF: + case CTT_SREF: / * evans 2001-07-24: constants should use the original term * / if (!constraintTerm_canGetValue (t)) { sRef snew; DPRINTF ((message("Doing sRef_fixInvarConstraint for %q ", - constraintTerm_print (t) ) )); + constraintTerm_unparse (t) ) )); snew = fixSref (ct, s, constraintTerm_getSRef(t)); @@ -2026,20 +2025,19 @@ doSRefFixConstraintParamTerm (/*@only@*/ constraintExpr e, /*@observer@*/ /*@tem switch (constraintTerm_getKind(t)) { - case EXPRNODE: - DPRINTF((message ("%q @ %q ", constraintTerm_print(t), + case CTT_EXPR: + DPRINTF((message ("%q @ %q ", constraintTerm_unparse(t), fileloc_unparse (constraintTerm_getFileloc(t) ) ) )); break; - case INTLITERAL: - DPRINTF((message (" %q ", constraintTerm_print (t)) )); + case CTT_INTLITERAL: + DPRINTF((message (" %q ", constraintTerm_unparse (t)) )); break; - - case SREF: + case CTT_SREF: /* evans 2001-07-24: constants should use the original term */ if (!constraintTerm_canGetValue (t)) { DPRINTF ((message("Doing sRef_fixConstraintParam for %q ", - constraintTerm_print (t) ) )); + constraintTerm_unparse (t) ) )); ret = sRef_fixConstraintParam (constraintTerm_getSRef(t), arglist); constraintExpr_free (e); diff --git a/src/constraintExprData.c b/src/constraintExprData.c index 24a064b..9ca1409 100644 --- a/src/constraintExprData.c +++ b/src/constraintExprData.c @@ -134,12 +134,16 @@ constraintExprData constraintExprData_copyTerm (/*@observer@*/ constraintExprDat return ret; } -constraintExprData constraintExprData_termSetTerm (/*@returned@*/ constraintExprData data, /*@only@*/constraintTerm term) +constraintExprData +constraintExprData_termSetTerm (/*@returned@*/ constraintExprData data, + /*@only@*/ constraintTerm term) { - llassert (constraintExprData_isDefined(data)); + llassert (constraintExprData_isDefined (data)); - if (constraintTerm_isDefined(data->term) ) - constraintTerm_free(data->term); + if (constraintTerm_isDefined (data->term)) + { + constraintTerm_free (data->term); + } data->term = term; return data; @@ -147,43 +151,49 @@ constraintExprData constraintExprData_termSetTerm (/*@returned@*/ constraintExp -/*@observer@*/ constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data) +/*@observer@*/ constraintTerm +constraintExprData_termGetTerm (/*@observer@*/ constraintExprData data) { - llassert (constraintExprData_isDefined(data)); + llassert (constraintExprData_isDefined (data)); /*@i22*/ return data->term; } -constraintExprUnaryOpKind constraintExprData_unaryExprGetOp (/*@observer@*/ constraintExprData data) +constraintExprUnaryOpKind +constraintExprData_unaryExprGetOp (/*@observer@*/ constraintExprData data) { - llassert (constraintExprData_isDefined(data)); + llassert (constraintExprData_isDefined (data)); return (data->unaryOp.unaryOp); } -constraintExpr constraintExprData_unaryExprGetExpr (/*@observer@*/ constraintExprData data) +constraintExpr +constraintExprData_unaryExprGetExpr (/*@observer@*/ constraintExprData data) { llassert (constraintExprData_isDefined (data)); return (data->unaryOp.expr); } - - -constraintExprData constraintExprData_unaryExprSetOp ( /*@returned@*/ constraintExprData data, constraintExprUnaryOpKind op) +constraintExprData +constraintExprData_unaryExprSetOp (/*@returned@*/ constraintExprData data, + constraintExprUnaryOpKind op) { llassert (constraintExprData_isDefined (data)); - data->unaryOp.unaryOp = op; return data; } -constraintExprData constraintExprData_unaryExprSetExpr (constraintExprData data, /*@only@*/ constraintExpr expr) +constraintExprData +constraintExprData_unaryExprSetExpr (constraintExprData data, + /*@only@*/ constraintExpr expr) { - llassert (constraintExprData_isDefined(data)); - - if (constraintExpr_isDefined(data->unaryOp.expr) ) - constraintExpr_free(data->unaryOp.expr); + llassert (constraintExprData_isDefined (data)); + + if (constraintExpr_isDefined (data->unaryOp.expr)) + { + constraintExpr_free (data->unaryOp.expr); + } data->unaryOp.expr = expr; return data; @@ -193,56 +203,55 @@ constraintExprData constraintExprData_unaryExprSetExpr (constraintExprData data ** binaryExpr stuff */ -constraintExprBinaryOpKind constraintExprData_binaryExprGetOp (constraintExprData data) +constraintExprBinaryOpKind constraintExprData_binaryExprGetOp (constraintExprData data) { - llassert (constraintExprData_isDefined(data)); - + llassert (constraintExprData_isDefined (data)); return (data->binaryOp.binaryOp); } - -constraintExpr constraintExprData_binaryExprGetExpr1 (constraintExprData data) +constraintExpr constraintExprData_binaryExprGetExpr1 (constraintExprData data) { - llassert (constraintExprData_isDefined(data)); - - + llassert (constraintExprData_isDefined (data)); return (data->binaryOp.expr1); } - -constraintExpr constraintExprData_binaryExprGetExpr2 (constraintExprData data) +constraintExpr constraintExprData_binaryExprGetExpr2 (constraintExprData data) { llassert (constraintExprData_isDefined(data)); /*@i22*/ return (data->binaryOp.expr2); } - -constraintExprData constraintExprData_binaryExprSetExpr1 ( /*@returned@*/ constraintExprData data, /*@only@*/ constraintExpr expr) +constraintExprData +constraintExprData_binaryExprSetExpr1 (/*@returned@*/ constraintExprData data, + /*@only@*/ constraintExpr expr) { - llassert (constraintExprData_isDefined(data)); + llassert (constraintExprData_isDefined (data)); - if (constraintExpr_isDefined(data->binaryOp.expr1) ) + if (constraintExpr_isDefined (data->binaryOp.expr1)) constraintExpr_free(data->binaryOp.expr1); data->binaryOp.expr1 = expr; return data; } -constraintExprData constraintExprData_binaryExprSetExpr2 (constraintExprData data, constraintExpr expr) +constraintExprData +constraintExprData_binaryExprSetExpr2 (constraintExprData data, constraintExpr expr) { - llassert (constraintExprData_isDefined(data)); - if (constraintExpr_isDefined(data->binaryOp.expr2) ) - constraintExpr_free(data->binaryOp.expr2); + llassert (constraintExprData_isDefined (data)); + if (constraintExpr_isDefined (data->binaryOp.expr2)) + constraintExpr_free (data->binaryOp.expr2); + data->binaryOp.expr2 = expr; return data; } - -constraintExprData constraintExprData_binaryExprSetOp (constraintExprData data, constraintExprBinaryOpKind op) +constraintExprData +constraintExprData_binaryExprSetOp (constraintExprData data, + constraintExprBinaryOpKind op) { - llassert (constraintExprData_isDefined(data)); + llassert (constraintExprData_isDefined (data)); data->binaryOp.binaryOp = op; return data; } diff --git a/src/constraintGeneration.c b/src/constraintGeneration.c index 17f2569..93cb256 100644 --- a/src/constraintGeneration.c +++ b/src/constraintGeneration.c @@ -146,7 +146,7 @@ bool /*@alt void@*/ exprNode_generateConstraints (/*@temp@*/ exprNode e) constraintList_free(c); } - DPRINTF ((message ("e->requiresConstraints %s", constraintList_printDetailed (e->requiresConstraints)))); + DPRINTF ((message ("e->requiresConstraints %s", constraintList_unparseDetailed (e->requiresConstraints)))); return FALSE; } @@ -252,8 +252,8 @@ static void exprNode_stmt (/*@temp@*/ exprNode e) e->ensuresConstraints = exprNode_traversEnsuresConstraints(snode); DPRINTF ((message ("smtlist constraints are: pre: %s \n and \t post %s\n", - constraintList_print(e->requiresConstraints), - constraintList_print(e->ensuresConstraints)))); + constraintList_unparse(e->requiresConstraints), + constraintList_unparse(e->ensuresConstraints)))); return; } @@ -293,8 +293,8 @@ static void exprNode_stmtList (/*@dependent@*/ exprNode e) exprNode_mergeResolve (e, stmt1, stmt2); DPRINTF ((message ("smtlist constraints are: pre: %s \n and \t post %s\n", - constraintList_print(e->requiresConstraints), - constraintList_print(e->ensuresConstraints)))); + constraintList_unparse(e->requiresConstraints), + constraintList_unparse(e->ensuresConstraints)))); return; } @@ -309,23 +309,23 @@ static exprNode doIf (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode test, llassert (exprNode_isDefined (body)); - DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints)))); + DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->ensuresConstraints)))); - DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints)))); + DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->ensuresConstraints)))); - DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->trueEnsuresConstraints)))); + DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->trueEnsuresConstraints)))); - DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->falseEnsuresConstraints)))); + DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->falseEnsuresConstraints)))); - DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->ensuresConstraints)))); + DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(test), constraintList_unparseDetailed(test->ensuresConstraints)))); - DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->ensuresConstraints)))); + DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(test), constraintList_unparseDetailed(test->ensuresConstraints)))); - DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->trueEnsuresConstraints)))); + DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(test), constraintList_unparseDetailed(test->trueEnsuresConstraints)))); - DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(test), constraintList_printDetailed(test->falseEnsuresConstraints)))); + DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(test), constraintList_unparseDetailed(test->falseEnsuresConstraints)))); @@ -344,9 +344,9 @@ static exprNode doIf (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode test, test->trueEnsuresConstraints = constraintList_substituteFreeTarget(test->trueEnsuresConstraints, test->ensuresConstraints); - DPRINTF ((message ("doIf: test ensures %s ", constraintList_print(test->ensuresConstraints)))); + DPRINTF ((message ("doIf: test ensures %s ", constraintList_unparse(test->ensuresConstraints)))); - DPRINTF ((message ("doIf: test true ensures %s ", constraintList_print(test->trueEnsuresConstraints)))); + DPRINTF ((message ("doIf: test true ensures %s ", constraintList_unparse(test->trueEnsuresConstraints)))); constraintList_free(e->requiresConstraints); @@ -371,7 +371,7 @@ static exprNode doIf (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode test, test->falseEnsuresConstraints); } - DPRINTF ((message ("doIf: if requiers %s ", constraintList_print(e->requiresConstraints)))); + DPRINTF ((message ("doIf: if requiers %s ", constraintList_unparse(e->requiresConstraints)))); return e; } @@ -434,8 +434,8 @@ static exprNode doIfElse (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode p, constraintList_free(cons); constraintList_free(c1); - DPRINTF ((message ("doIfElse: if requires %q ", constraintList_print(e->requiresConstraints)))); - DPRINTF ((message ("doIfElse: if ensures %q ", constraintList_print(e->ensuresConstraints)))); + DPRINTF ((message ("doIfElse: if requires %q ", constraintList_unparse(e->requiresConstraints)))); + DPRINTF ((message ("doIfElse: if ensures %q ", constraintList_unparse(e->ensuresConstraints)))); return e; } @@ -489,7 +489,7 @@ static exprNode doWhile (/*@returned@*/ exprNode e, /*@dependent@*/ exprNode tes end_sRefSet_elements ; DPRINTF((message("constraintList_makeFixedArrayConstraints returning %s", - constraintList_print(ret)))); + constraintList_unparse(ret)))); return ret; } @@ -641,7 +641,7 @@ exprNode_doGenerateConstraintSwitch DPRINTF((message("returning from exprNode_doGenerateConstraintSwitch: (switch %s) %s currentRequires:" "%s currentEnsures:%s", exprNode_unparse(switchExpr), exprNode_unparse(body), - constraintList_print(*currentRequires), constraintList_print(*currentEnsures) + constraintList_unparse(*currentRequires), constraintList_unparse(*currentEnsures) ))); /*@-onlytrans@*/ return; @@ -692,7 +692,7 @@ exprNode_doGenerateConstraintSwitch DPRINTF((message("exprNode_doGenerateConstraintSwitch: (switch %s) %s savedRequires:" "%s savedEnsures:%s", exprNode_unparse(switchExpr), exprNode_unparse(body), - constraintList_print(*savedRequires), constraintList_print(*savedEnsures) + constraintList_unparse(*savedRequires), constraintList_unparse(*savedEnsures) ))); } @@ -754,7 +754,7 @@ exprNode_doGenerateConstraintSwitch DPRINTF((message("returning from exprNode_doGenerateConstraintSwitch: (switch %s) %s currentRequires:" "%s currentEnsures:%s", exprNode_unparse(switchExpr), exprNode_unparse(body), - constraintList_print(*currentRequires), constraintList_print(*currentEnsures) + constraintList_unparse(*currentRequires), constraintList_unparse(*currentEnsures) ))); /*@-onlytrans@*/ return; @@ -825,8 +825,8 @@ static void exprNode_generateConstraintSwitch (/*@notnull@*/ exprNode switchStmt constraintList_free (lastEnsures); DPRINTF(((message(" exprNode_generateConstraintSwitch returning requires: %s and ensures %s", - constraintList_print(switchStmt->requiresConstraints), - constraintList_print(switchStmt->ensuresConstraints) + constraintList_unparse(switchStmt->requiresConstraints), + constraintList_unparse(switchStmt->ensuresConstraints) ) ))); } @@ -955,7 +955,7 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e) - DPRINTF((message("p->trueEnsuresConstraints before substitue %s", constraintList_print(p->trueEnsuresConstraints) ) + DPRINTF((message("p->trueEnsuresConstraints before substitue %s", constraintList_unparse(p->trueEnsuresConstraints) ) )); /*drl 10/10/2002 this is a bit of a hack but the reason why we do this is so that any function post conditions or similar things get applied correctly to each branch. e.g. in strlen(s) < 5 we want the trueEnsures to be maxRead(s) < 5*/ @@ -963,7 +963,7 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e) p->trueEnsuresConstraints = constraintList_substituteFreeTarget (p->trueEnsuresConstraints, p->ensuresConstraints); - DPRINTF(( message ("p->trueEnsuresConstraints after substitue %s", constraintList_print(p->trueEnsuresConstraints) ) + DPRINTF(( message ("p->trueEnsuresConstraints after substitue %s", constraintList_unparse(p->trueEnsuresConstraints) ) )); temp = p->falseEnsuresConstraints; @@ -987,7 +987,7 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e) exprNode_generateConstraints (e2); exprNode_generateConstraints (e1); e = exprNode_copyConstraints (e, e2); - DPRINTF ((message ("e = %s ", constraintList_print(e->requiresConstraints)))); + DPRINTF ((message ("e = %s ", constraintList_unparse(e->requiresConstraints)))); break; @@ -1594,13 +1594,13 @@ void exprNode_exprTraverse (/*@dependent@*/ exprNode e, bool definatelv, bool de e->requiresConstraints = constraintList_removeSurpressed(e->requiresConstraints); - DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints)))); + DPRINTF((message ("ensures constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->ensuresConstraints)))); - DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->ensuresConstraints)))); + DPRINTF((message ("Requires constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->ensuresConstraints)))); - DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->trueEnsuresConstraints)))); + DPRINTF((message ("trueEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->trueEnsuresConstraints)))); - DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_printDetailed(e->falseEnsuresConstraints)))); + DPRINTF((message ("falseEnsures constraints for %s are %s", exprNode_unparse(e), constraintList_unparseDetailed(e->falseEnsuresConstraints)))); return; } @@ -2037,7 +2037,7 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e) DPRINTF ((message ("exprnode_traversEnsuresConstraints call for %s with " "constraintList of %s", exprNode_unparse (e), - constraintList_print(e->ensuresConstraints) + constraintList_unparse(e->ensuresConstraints) ) )); @@ -2146,7 +2146,7 @@ constraintList exprNode_traversFalseEnsuresConstraints (exprNode e) DPRINTF((message ("exprnode_traversEnsuresConstraints call for %s with " "constraintList of is returning %s", exprNode_unparse (e), - constraintList_print(ret)))); + constraintList_unparse(ret)))); return ret; } @@ -2242,13 +2242,13 @@ we'll include it in a production release when its stable... invars = getInvariants(ct); - TPRINTF((message ("findStructs has invariants %s ", constraintList_print (invars)) + TPRINTF((message ("findStructs has invariants %s ", constraintList_unparse (invars)) )); invars = constraintList_doSRefFixStructConstraint(invars, exprNode_getSref(expr), ct); - TPRINTF((message ("findStructs finded invariants to be %s ", constraintList_print (invars)) + TPRINTF((message ("findStructs finded invariants to be %s ", constraintList_unparse (invars)) )); } } @@ -2317,7 +2317,7 @@ constraintList checkCall (/*@dependent@*/ exprNode fcn, exprNodeList arglist) } DPRINTF ((message("Done checkCall\n"))); - DPRINTF ((message("Returning list %q ", constraintList_printDetailed(preconditions)))); + DPRINTF ((message("Returning list %q ", constraintList_unparseDetailed(preconditions)))); /* drl we're going to comment this out for now diff --git a/src/constraintList.c b/src/constraintList.c index b0bc30b..625d716 100644 --- a/src/constraintList.c +++ b/src/constraintList.c @@ -180,14 +180,14 @@ constraintList constraintList_removeSurpressed (/*@only@*/ constraintList s) else if (context_suppressFlagMsg(FLG_BOUNDSWRITE, loc) ) { DPRINTF ((message ("constraintList_removeSurpressed getting rid of surpressed constraint %q", - constraint_print(elem)))); + constraint_unparse(elem)))); constraint_free(elem); } else if (!constraint_hasMaxSet(elem) && context_suppressFlagMsg(FLG_BOUNDSREAD, loc)) { DPRINTF ((message("constraintList_removeSurpressed getting rid of surpressed constraint %q", - constraint_print(elem)))); + constraint_unparse(elem)))); constraint_free(elem); } else @@ -203,15 +203,9 @@ constraintList constraintList_removeSurpressed (/*@only@*/ constraintList s) return ret; } - -extern /*@only@*/ cstring constraintList_unparse ( /*@observer@*/ constraintList s) /*@*/ -{ - return (constraintList_print(s)); -} - # if 0 static /*@only@*/ cstring -constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/ +constraintList_unparseLocation (/*@temp@*/ constraintList s) /*@*/ { int i; cstring st = cstring_undefined; @@ -236,7 +230,7 @@ constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/ if (constraint_isDefined(current) ) { cstring temp1; - temp1 = constraint_printLocation(current); + temp1 = constraint_unparseLocation(current); type = message ("%q %q\n", type, temp1 ); } @@ -256,7 +250,7 @@ constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/ # endif /*@only@*/ cstring -constraintList_print (/*@temp@*/ constraintList s) /*@*/ +constraintList_unparse (/*@temp@*/ constraintList s) /*@*/ { int i; cstring st = cstring_undefined; @@ -284,11 +278,11 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/ if (context_getFlag (FLG_ORCONSTRAINT)) { - temp1 = constraint_printOr(current); + temp1 = constraint_unparseOr(current); } else { - temp1 = constraint_print (current); + temp1 = constraint_unparse (current); } type = message ("%q %q\n", type, temp1 ); } @@ -307,7 +301,7 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/ return st; } -void constraintList_printErrorPostConditions (constraintList s, fileloc loc) +void constraintList_unparseErrorPostConditions (constraintList s, fileloc loc) { constraintList_elements (s, elem) @@ -321,7 +315,7 @@ void constraintList_printErrorPostConditions (constraintList s, fileloc loc) return; } -void constraintList_printError (constraintList s, fileloc loc) +void constraintList_unparseError (constraintList s, fileloc loc) { constraintList_elements (s, elem) @@ -340,7 +334,7 @@ void constraintList_printError (constraintList s, fileloc loc) cstring -constraintList_printDetailed (constraintList s) +constraintList_unparseDetailed (constraintList s) { int i; cstring st = cstring_undefined; @@ -364,7 +358,7 @@ constraintList_printDetailed (constraintList s) if (constraint_isDefined(current ) ) { - cstring temp1 = constraint_printDetailed (current); + cstring temp1 = constraint_unparseDetailed (current); type = message ("%s %s\n", type, temp1 ); cstring_free(temp1); } @@ -392,8 +386,8 @@ constraintList_logicalOr (/*@observer@*/ constraintList l1, /*@observer@*/ const constraint temp; constraintList ret; DPRINTF ((message ("Logical or on %s and %s", - constraintList_print(l1), - constraintList_print(l2)) ) ); + constraintList_unparse(l1), + constraintList_unparse(l2)) ) ); ret = constraintList_makeNew(); constraintList_elements (l1, el) @@ -438,22 +432,22 @@ constraintList_logicalOr (/*@observer@*/ constraintList l1, /*@observer@*/ const void constraintList_free (/*@only@*/ constraintList s) { - int i; - - llassert(constraintList_isDefined(s) ); - - - for (i = 0; i < s->nelements; i++) + if (constraintList_isDefined (s)) { - constraint_free (s->elements[i]); + int i; + + for (i = 0; i < s->nelements; i++) + { + constraint_free (s->elements[i]); + } + + sfree (s->elements); + s->elements = NULL; + s->nelements = -1; + s->nspace = -1; + sfree (s); + s = NULL; } - - sfree (s->elements); - s->elements = NULL; - s->nelements = -1; - s->nspace = -1; - sfree (s); - s = NULL; } constraintList @@ -471,7 +465,7 @@ constraintList_copy (/*@observer@*/ /*@temp@*/ constraintList s) constraintList constraintList_preserveOrig (constraintList c) { - DPRINTF((message("constraintList_preserveOrig preserving the originial constraints for %s ", constraintList_print (c) ) )); + DPRINTF((message("constraintList_preserveOrig preserving the originial constraints for %s ", constraintList_unparse (c) ) )); constraintList_elements_private (c, el) { @@ -483,7 +477,7 @@ constraintList constraintList_preserveOrig (constraintList c) constraintList constraintList_preserveCallInfo (/*@returned@*/ constraintList c,/*@observer@*/ /*@dependent@*/ /*@observer@*/ exprNode fcn) { - DPRINTF((message("constraintList_preserveCallInfo %s ", constraintList_print (c) ) )); + DPRINTF((message("constraintList_preserveCallInfo %s ", constraintList_unparse (c) ) )); constraintList_elements_private (c, el) { @@ -508,7 +502,7 @@ constraintList constraintList_addGeneratingExpr (constraintList c,/*@dependent@* constraintList_elements_private (c, el) { - DPRINTF ((message ("setting generatingExpr for %s to %s", constraint_print(el), exprNode_unparse(e) ) )); + DPRINTF ((message ("setting generatingExpr for %s to %s", constraint_unparse(el), exprNode_unparse(e) ) )); el = constraint_addGeneratingExpr (el, e); } end_constraintList_elements_private; diff --git a/src/constraintResolve.c b/src/constraintResolve.c index fc9f964..31b4382 100644 --- a/src/constraintResolve.c +++ b/src/constraintResolve.c @@ -55,91 +55,80 @@ static constraint constraint_searchandreplace (/*@returned@*/ constraint p_c, co static constraint constraint_addOr (/*@returned@*/ constraint p_orig, /*@observer@*/ constraint p_orConstr); -static bool resolveOr (/*@temp@*/constraint p_c, /*@observer@*/ /*@temp@*/ constraintList p_list); +static bool constraint_resolveOr (/*@temp@*/constraint p_c, /*@observer@*/ /*@temp@*/ constraintList p_list); static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constraintList p_pre2, constraintList p_post1); - -/*@only@*/ constraintList constraintList_mergeEnsuresFreeFirst (constraintList list1, constraintList list2) +/*@only@*/ constraintList +constraintList_mergeEnsuresFreeFirst (constraintList list1, constraintList list2) { - constraintList ret; - - ret = constraintList_mergeEnsures (list1, list2); - - constraintList_free(list1); + constraintList ret = constraintList_mergeEnsures (list1, list2); + constraintList_free (list1); return ret; } -/*@only@*/ constraintList constraintList_mergeEnsures (constraintList list1, constraintList list2) +/*@only@*/ constraintList +constraintList_mergeEnsures (constraintList list1, constraintList list2) { constraintList ret; constraintList temp; - llassert(constraintList_isDefined(list1) ); - llassert(constraintList_isDefined(list2) ); + llassert (constraintList_isDefined (list1)); + llassert (constraintList_isDefined (list2)); - DPRINTF(( message ("constraintList_mergeEnsures: list1 %s list2 %s", - constraintList_print(list1), constraintList_print(list2) - ))); + DPRINTF (("constraintList_mergeEnsures: list1 %s list2 %s", + constraintList_unparse (list1), constraintList_unparse (list2))); ret = constraintList_fixConflicts (list1, list2); ret = reflectChangesEnsuresFree1 (ret, list2); temp = constraintList_subsumeEnsures (ret, list2); - constraintList_free(ret); - ret = temp; + constraintList_free (ret); + ret = temp; temp = constraintList_subsumeEnsures (list2, ret); - temp = constraintList_addList (temp, ret); - constraintList_free(ret); + constraintList_free (ret); - DPRINTF(( message ("constraintList_mergeEnsures: returning %s ", - constraintList_print(temp) ) - )); - - + DPRINTF (("constraintList_mergeEnsures: returning %s", constraintList_unparse (temp))); return temp; } - -/*@only@*/ constraintList constraintList_mergeRequiresFreeFirst (/*@only@*/ constraintList list1, constraintList list2) +/*@only@*/ constraintList +constraintList_mergeRequiresFreeFirst (/*@only@*/ constraintList list1, + constraintList list2) { - constraintList ret; - - ret = constraintList_mergeRequires(list1, list2); - - constraintList_free(list1); - + constraintList ret = constraintList_mergeRequires (list1, list2); + constraintList_free (list1); return ret; } -/*@only@*/ constraintList constraintList_mergeRequires (constraintList list1, constraintList list2) +/*@only@*/ constraintList +constraintList_mergeRequires (constraintList list1, constraintList list2) { constraintList ret; constraintList temp; - DPRINTF((message ("constraintList_mergeRequires: merging %s and %s ", constraintList_print (list1), constraintList_print(list2) ) ) ); + DPRINTF (("constraintList_mergeRequires: merging %s and %s", + constraintList_unparse (list1), constraintList_unparse (list2))); - if (context_getFlag (FLG_REDUNDANTCONSTRAINTS) ) + if (context_getFlag (FLG_REDUNDANTCONSTRAINTS)) { - ret = constraintList_copy(list1); - ret = constraintList_addList(ret, list2); + ret = constraintList_copy (list1); + ret = constraintList_addList (ret, list2); return ret; } - + /* get constraints in list1 not satified by list2 */ - temp = constraintList_reflectChanges(list1, list2); - DPRINTF((message ("constraintList_mergeRequires: temp = %s", constraintList_print(temp) ) ) ); - -/*get constraints in list2 not satified by temp*/ - ret = constraintList_reflectChanges(list2, temp); - - DPRINTF((message ("constraintList_mergeRequires: ret = %s", constraintList_print(ret) ) ) ); + temp = constraintList_reflectChanges (list1, list2); + DPRINTF (("constraintList_mergeRequires: temp = %s", constraintList_unparse (temp))); + + /* get constraints in list2 not satified by temp*/ + ret = constraintList_reflectChanges (list2, temp); + DPRINTF (("constraintList_mergeRequires: ret = %s", constraintList_unparse(ret))); ret = constraintList_addListFree (ret, temp); + DPRINTF (("constraintList_mergeRequires: returning %s", constraintList_unparse(ret))); - DPRINTF((message ("constraintList_mergeRequires: returning %s", constraintList_print(ret) ) ) ); - return ret; } @@ -148,285 +137,260 @@ void exprNode_mergeResolve (exprNode parent, exprNode child1, exprNode child2) { constraintList temp, temp2; - DPRINTF((message ("magically merging constraint into parent:%s for", exprNode_unparse (parent) )) ); + DPRINTF((message ("magically merging constraint into parent:%s for", exprNode_unparse (parent)))); - DPRINTF((message (" children: %s and %s", exprNode_unparse (child1), exprNode_unparse(child2) ) ) ); + DPRINTF((message (" children: %s and %s", exprNode_unparse (child1), exprNode_unparse(child2)))); - - if (exprNode_isUndefined(parent) ) + if (exprNode_isUndefined (parent)) { - llassert (exprNode_isDefined(parent) ); + llassert (exprNode_isDefined (parent)); return; } - if (exprNode_isError (child1) || exprNode_isError(child2) ) + if (exprNode_isError (child1) || exprNode_isError (child2)) { - if (exprNode_isError (child1) && !exprNode_isError(child2) ) + if (exprNode_isError (child1) && !exprNode_isError (child2)) { - constraintList_free(parent->requiresConstraints); - + constraintList_free (parent->requiresConstraints); parent->requiresConstraints = constraintList_copy (child2->requiresConstraints); - constraintList_free(parent->ensuresConstraints); + constraintList_free (parent->ensuresConstraints); parent->ensuresConstraints = constraintList_copy (child2->ensuresConstraints); - DPRINTF((message ("Copied child constraints: pre: %s and post: %s", - constraintList_print( child2->requiresConstraints), - constraintList_print (child2->ensuresConstraints) - ) - )); + DPRINTF (("Copied child constraints: pre: %s and post: %s", + constraintList_unparse(child2->requiresConstraints), + constraintList_unparse (child2->ensuresConstraints))); return; } else { - llassert(exprNode_isError(child2) ); + llassert (exprNode_isError (child2)); return; } } - llassert(!exprNode_isError (child1) && ! exprNode_isError(child2) ); + 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) - ) ) ); - - - constraintList_free(parent->requiresConstraints); - - parent->requiresConstraints = constraintList_copy (child1->requiresConstraints); - - if ( context_getFlag (FLG_ORCONSTRAINT) ) - temp = constraintList_reflectChangesOr (child2->requiresConstraints, child1->ensuresConstraints); - else - temp = constraintList_reflectChanges(child2->requiresConstraints, child1->ensuresConstraints); - - temp2 = constraintList_mergeRequires (parent->requiresConstraints, temp); - constraintList_free(parent->requiresConstraints); - constraintList_free(temp); - - parent->requiresConstraints = temp2; - - DPRINTF((message ("Parent requires constraints are %s ", - constraintList_print (parent->requiresConstraints) - ) ) ); - - constraintList_free(parent->ensuresConstraints); - - parent->ensuresConstraints = constraintList_mergeEnsures(child1->ensuresConstraints, - child2->ensuresConstraints); - - - DPRINTF((message ("Parent constraints are %s and %s ", - constraintList_print (parent->requiresConstraints), - constraintList_print (parent->ensuresConstraints) - ) ) ); + DPRINTF (("Child constraints are %s %s and %s %s", + constraintList_unparse (child1->requiresConstraints), + constraintList_unparse (child1->ensuresConstraints), + constraintList_unparse (child2->requiresConstraints), + constraintList_unparse (child2->ensuresConstraints))); + constraintList_free (parent->requiresConstraints); + parent->requiresConstraints = constraintList_copy (child1->requiresConstraints); + + if (context_getFlag (FLG_ORCONSTRAINT)) + { + temp = constraintList_reflectChangesOr (child2->requiresConstraints, child1->ensuresConstraints); + } + else + { + temp = constraintList_reflectChanges(child2->requiresConstraints, child1->ensuresConstraints); + } + + temp2 = constraintList_mergeRequires (parent->requiresConstraints, temp); + constraintList_free (parent->requiresConstraints); + constraintList_free (temp); + + parent->requiresConstraints = temp2; + + DPRINTF (("Parent requires constraints are %s ", + constraintList_unparse (parent->requiresConstraints))); + + constraintList_free (parent->ensuresConstraints); + + parent->ensuresConstraints = constraintList_mergeEnsures (child1->ensuresConstraints, + child2->ensuresConstraints); + + + DPRINTF (("Parent constraints are %s and %s ", + constraintList_unparse (parent->requiresConstraints), + constraintList_unparse (parent->ensuresConstraints))); } - - - -/*@only@*/ constraintList constraintList_subsumeEnsures (constraintList list1, constraintList list2) +/*@only@*/ constraintList +constraintList_subsumeEnsures (constraintList list1, constraintList list2) { - constraintList ret; - ret = constraintList_makeNew(); + constraintList ret = constraintList_makeNew (); + constraintList_elements (list1, el) { - - DPRINTF ((message ("Examining %s", constraint_print (el) ) ) ); - if (!constraintList_resolve (el, list2) ) + DPRINTF (("Examining %s", constraint_unparse (el))); + if (!constraintList_resolve (el, list2)) { - constraint temp; - temp = constraint_copy(el); + constraint temp = constraint_copy (el); ret = constraintList_add (ret, temp); } else { - DPRINTF ((message ("Subsuming %s", constraint_print (el) ) ) ); + DPRINTF (("Subsuming %s", constraint_unparse (el))); } } end_constraintList_elements; return ret; } - - -/*used to be reflectChangesFreePre renamed for Czech naming conventino*/ /* tries to resolve constraints in list pre2 using post1 */ -/*@only@*/ constraintList constraintList_reflectChangesFreePre (/*@only@*/ constraintList pre2, /*@observer@*/ constraintList post1) +/*@only@*/ constraintList +constraintList_reflectChangesFreePre (/*@only@*/ constraintList pre2, /*@observer@*/ constraintList post1) { - constraintList ret; - - ret = constraintList_reflectChanges(pre2, post1); - + constraintList ret = constraintList_reflectChanges(pre2, post1); constraintList_free (pre2); - return ret; } /* tries to resolve constraints in list pre2 using post1 */ - -static /*@only@*/ constraintList reflectChangesNoOr (/*@observer@*/ /*@temp@*/ constraintList pre2, /*@observer@*/ /*@temp@*/ constraintList post1) +static /*@only@*/ constraintList +constraintList_reflectChangesNoOr (/*@observer@*/ /*@temp@*/ constraintList pre2, + /*@observer@*/ /*@temp@*/ constraintList post1) { + constraintList ret = constraintList_makeNew (); - constraintList ret; - constraint temp; - constraint temp2; - - llassert (! context_getFlag (FLG_ORCONSTRAINT) ); - - ret = constraintList_makeNew(); - DPRINTF((message ("reflectChanges: lists %s and %s", constraintList_print(pre2), constraintList_print(post1) ))); + llassert (!context_getFlag (FLG_ORCONSTRAINT)); + + DPRINTF (("reflectChanges: lists %s and %s", + constraintList_unparse (pre2), constraintList_unparse (post1))); constraintList_elements (pre2, el) { - if (!constraintList_resolve (el, post1) ) + if (!constraintList_resolve (el, post1)) { - temp = constraint_substitute (el, post1); - if (!constraintList_resolve (temp, post1) ) + constraint temp = constraint_substitute (el, post1); + + if (!constraintList_resolve (temp, post1)) { /* try inequality substitution 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); + constraint temp2 = constraint_copy (temp); temp2 = inequalitySubstitute (temp2, post1); - if (!constraintList_resolve (temp2, post1) ) + + if (!constraintList_resolve (temp2, post1)) { temp2 = inequalitySubstituteUnsound (temp2, post1); - if (!constraintList_resolve (temp2, post1) ) - ret = constraintList_add (ret, temp2); + if (!constraintList_resolve (temp2, post1)) + { + ret = constraintList_add (ret, temp2); + } else - constraint_free(temp2); + { + constraint_free (temp2); + } } else { - constraint_free(temp2); + constraint_free (temp2); } } - constraint_free(temp); + constraint_free (temp); } } end_constraintList_elements; - DPRINTF((message ("reflectChanges: returning %s", constraintList_print(ret) ) ) ); - return ret; + DPRINTF (("reflectChanges: returning %s", constraintList_unparse(ret))); + return ret; } /* tries to resolve constraints in list pre2 using post1 */ -/*@only@*/ constraintList constraintList_reflectChanges(/*@observer@*/ constraintList pre2, /*@observer@*/ constraintList post1) +/*@only@*/ constraintList +constraintList_reflectChanges (/*@observer@*/ constraintList pre2, /*@observer@*/ constraintList post1) { - constraintList temp; - - if ( context_getFlag (FLG_ORCONSTRAINT) ) - - temp = constraintList_reflectChangesOr (pre2, post1); + if (context_getFlag (FLG_ORCONSTRAINT)) + { + return constraintList_reflectChangesOr (pre2, post1); + } else - temp = reflectChangesNoOr(pre2, post1); - - return temp; + { + return constraintList_reflectChangesNoOr (pre2, post1); + } } -static constraint constraint_addOr (/*@returned@*/ constraint orig, /*@observer@*/ constraint orConstr) +static constraint +constraint_addOr (/*@returned@*/ constraint orig, /*@observer@*/ constraint orConstr) { - constraint c; + constraint c = orig; + llassert (constraint_isDefined (c)); - llassert(constraint_isDefined(orig) ); - - c = orig; - - DPRINTF((message("constraint_addor: oring %s onto %s", constraint_printOr(orConstr), constraint_printOr(orig) ) )); + DPRINTF (("constraint_addor: oring %s onto %s", + constraint_unparseOr (orConstr), constraint_unparseOr (orig))); while (c->or != NULL) { c = c->or; } - c->or = constraint_copy(orConstr); - - DPRINTF((message("constraint_addor: returning %s",constraint_printOr(orig) ) )); + c->or = constraint_copy (orConstr); + DPRINTF (("constraint_addor: returning %s",constraint_unparseOr (orig))); return orig; } - -static bool resolveOr ( /*@temp@*/ constraint c, /*@observer@*/ /*@temp@*/ constraintList list) +static bool constraint_resolveOr (/*@temp@*/ constraint c, /*@observer@*/ /*@temp@*/ constraintList list) { - constraint temp; - - int numberOr; - - numberOr = 0; - - llassert(constraint_isDefined(c) ); + constraint temp = c; + int numberOr = 0; - DPRINTF(( message("resolveOr: constraint %s and list %s", constraint_printOr(c), constraintList_print(list) ) )); + llassert (constraint_isDefined(c)); + DPRINTF (("constraint_resolveOr: constraint %s and list %s", + constraint_printOr (c), constraintList_print (list))); - temp = c; - do { - if (constraintList_resolve (temp, list) ) - return TRUE; + if (constraintList_resolve (temp, list)) + { + return TRUE; + } + temp = temp->or; numberOr++; llassert(numberOr <= 10); } - while (constraint_isDefined(temp)); + while (constraint_isDefined (temp)); return FALSE; } -/*This is a "helper" function for doResolveOr */ +/* This is a "helper" function for doResolveOr */ static /*@only@*/ constraint doResolve (/*@only@*/ constraint c, constraintList post1, bool * resolved) { - constraint temp; + llassert (constraint_isDefined (c)); - llassert(constraint_isDefined (c ) ); - - DPRINTF((message("doResolve:: call on constraint c = : %q and constraintList %q", - constraint_printOr(c), constraintList_print(post1) - ) - )); + DPRINTF (("doResolve:: call on constraint c = : %q and constraintList %q", + constraint_unparseOr (c), constraintList_unparse (post1))); - if (!resolveOr (c, post1) ) - { - - temp = constraint_substitute (c, post1); - - DPRINTF((message("doResolve:: after substitute temp is %q", - constraint_printOr(temp) - ) - )); + if (!constraint_resolveOr (c, post1)) + { + constraint temp = constraint_substitute (c, post1); + DPRINTF (("doResolve:: after substitute temp is %q", constraint_unparseOr (temp))); - if (!resolveOr (temp, post1) ) + if (!constraint_resolveOr (temp, post1)) { /* try inequality substitution */ - constraint temp2; + constraint temp2 = constraint_copy (c); - /* the inequality substitution may cause us to lose information - so we don't want to store the result but we do anyway + /* + ** the inequality substitution may cause us to lose information + ** so we don't want to store the result but we do anyway */ - temp2 = constraint_copy (c); + temp2 = inequalitySubstitute (temp2, post1); - if (!resolveOr (temp2, post1) ) + if (!constraint_resolveOr (temp2, post1)) { - constraint temp3; - temp3 = constraint_copy(temp2); - + constraint temp3 = constraint_copy(temp2); temp3 = inequalitySubstituteStrong (temp3, post1); - if (!resolveOr (temp3, post1) ) + + if (!constraint_resolveOr (temp3, post1)) { temp2 = inequalitySubstituteUnsound (temp2, post1); - if (!resolveOr (temp2, post1) ) + + if (!constraint_resolveOr (temp2, post1)) { - if (!constraint_same (temp, temp2) ) + if (!constraint_same (temp, temp2)) { /* drl added 8/28/2002*/ /*make sure that the information from @@ -435,100 +399,80 @@ static /*@only@*/ constraint doResolve (/*@only@*/ constraint c, constraintList constraint tempSub; tempSub = constraint_substitute (temp2, post1); - DPRINTF(( - message("doResolve: adding %s ", - constraint_printOr(tempSub) - ) - )); - - DPRINTF(( - message("doResolve: not adding %s ", - constraint_printOr(temp2) - ) - )); - + DPRINTF (("doResolve: adding %s", constraint_unparseOr (tempSub))); + DPRINTF (("doResolve: not adding %s", constraint_unparseOr (temp2))); + temp = constraint_addOr (temp, tempSub); - constraint_free(tempSub); - + constraint_free (tempSub); } - if (!constraint_same (temp, temp3) && !constraint_same (temp3, temp2) ) + + if (!constraint_same (temp, temp3) && !constraint_same (temp3, temp2)) { - /* drl added 8/28/2002*/ - /*make sure that the information from - a post condition like i = i + 1 is transfered + /* drl added 8/28/2002*/ + /* make sure that the information from + a post condition like i = i + 1 is transfered */ constraint tempSub; tempSub = constraint_substitute (temp3, post1); - DPRINTF(( - message("doResolve: adding %s ", - constraint_printOr(tempSub) - ) - )); - - - DPRINTF(( - message("doResolve: not adding %s ", - constraint_printOr(temp3) - ) - )); + DPRINTF (("doResolve: adding %s", constraint_unparseOr (tempSub))); + DPRINTF (("doResolve: not adding %s", constraint_unparseOr(temp3))); temp = constraint_addOr (temp, tempSub); - constraint_free(tempSub); } + *resolved = FALSE; - constraint_free(temp2); - constraint_free(temp3); - constraint_free(c); + constraint_free (temp2); + constraint_free (temp3); + constraint_free (c); return temp; } - constraint_free(temp2); - constraint_free(temp3); + + constraint_free (temp2); + constraint_free (temp3); } else { - constraint_free(temp2); - constraint_free(temp3); + constraint_free (temp2); + constraint_free (temp3); } } else { - constraint_free(temp2); + constraint_free (temp2); } } - constraint_free(temp); + constraint_free (temp); } - constraint_free(c); - - /*drl bee: pbr*/ *resolved = TRUE; + + constraint_free (c); + /*@i523@*/ /*drl bee: pbr*/ *resolved = TRUE; return NULL; } -static /*@only@*/ constraint doResolveOr (/*@observer@*/ /*@temp@*/ constraint c, constraintList post1, /*@out@*/bool * resolved) +static /*@only@*/ constraint +doResolveOr (/*@observer@*/ /*@temp@*/ constraint c, constraintList post1, /*@out@*/ bool *resolved) { constraint ret; constraint next; constraint curr; - - DPRINTF(( message("doResolveOr: constraint %s and list %s", constraint_printOr(c), constraintList_print(post1) ) )); - - + DPRINTF (("doResolveOr: constraint %s and list %s", + constraint_unparseOr (c), constraintList_unparse (post1))); - /*drl bee: pbr*/ *resolved = FALSE; - - llassert(constraint_isDefined(c) ); - - ret = constraint_copy(c); + /*@i523@*/ /*drl bee: pbr*/ *resolved = FALSE; + + llassert (constraint_isDefined (c)); + ret = constraint_copy (c); - llassert(constraint_isDefined(ret) ); + llassert (constraint_isDefined (ret)); - if (constraintList_isEmpty(post1) ) + if (constraintList_isEmpty (post1)) { return ret; } @@ -537,15 +481,16 @@ static /*@only@*/ constraint doResolveOr (/*@observer@*/ /*@temp@*/ constraint c ret->or = NULL; ret = doResolve (ret, post1, resolved); - + if (*resolved) { if (next != NULL) - constraint_free(next); - - /*we don't need to free ret when resolved is false because ret is null*/ - llassert(ret == NULL); + { + constraint_free (next); + } + /* we don't need to free ret when resolved is false because ret is null*/ + llassert (ret == NULL); return NULL; } @@ -554,18 +499,20 @@ static /*@only@*/ constraint doResolveOr (/*@observer@*/ /*@temp@*/ constraint c curr = next; next = curr->or; curr->or = NULL; - + curr = doResolve (curr, post1, resolved); - /*drl bee: pbr*/ if (*resolved) + /*@i423@*/ /*drl bee: pbr*/ if (*resolved) { /* curr is null so we don't try to free it*/ - llassert(curr == NULL); + llassert (curr == NULL); if (next != NULL) - constraint_free(next); + { + constraint_free (next); + } - constraint_free(ret); + constraint_free (ret); return NULL; } ret = constraint_addOr (ret, curr); @@ -575,215 +522,217 @@ static /*@only@*/ constraint doResolveOr (/*@observer@*/ /*@temp@*/ constraint c } /* tries to resolve constraints in list pr2 using post1 */ -/*@only@*/ constraintList constraintList_reflectChangesOr (constraintList pre2, constraintList post1) +/*@only@*/ constraintList +constraintList_reflectChangesOr (constraintList pre2, constraintList post1) { bool resolved; constraintList ret; constraint temp; ret = constraintList_makeNew(); - DPRINTF((message ("constraintList_reflectChangesOr: lists %s and %s", constraintList_print(pre2), constraintList_print(post1) ))); + + DPRINTF (("constraintList_reflectChangesOr: lists %s and %s", + constraintList_unparse (pre2), constraintList_unparse (post1))); constraintList_elements (pre2, el) { temp = doResolveOr (el, post1, &resolved); - + if (!resolved) { ret = constraintList_add(ret, temp); } else { - /* we don't need to free temp when - resolved is false because temp is null */ - llassert(temp == NULL); + /* we don't need to free temp when + resolved is false because temp is null */ + llassert (temp == NULL); } - } end_constraintList_elements; - - DPRINTF((message ("constraintList_reflectChangesOr: returning %s", constraintList_print(ret) ) ) ); - return ret; + + DPRINTF (("constraintList_reflectChangesOr: returning %s", constraintList_unparse (ret))); + return ret; } -static /*@only@*/ constraintList reflectChangesEnsures (/*@observer@*/ constraintList pre2, constraintList post1) +static /*@only@*/ constraintList +reflectChangesEnsures (/*@observer@*/ constraintList pre2, constraintList post1) { - constraintList ret; - constraint temp; - ret = constraintList_makeNew(); + constraintList ret = constraintList_makeNew (); + constraintList_elements (pre2, el) { - if (!constraintList_resolve (el, post1) ) + if (!constraintList_resolve (el, post1)) { - temp = constraint_substitute (el, post1); + constraint temp = constraint_substitute (el, post1); llassert (temp != NULL); - - if (!constraintList_resolve (temp, post1) ) - ret = constraintList_add (ret, temp); + + if (!constraintList_resolve (temp, post1)) + { + ret = constraintList_add (ret, temp); + } else - constraint_free(temp); + { + constraint_free (temp); + } } else { - DPRINTF ((message ("Resolved away %s ", constraint_print(el) ) ) ); + DPRINTF (("Resolved away %s ", constraint_unparse(el))); } } end_constraintList_elements; - - return ret; + + return ret; } -static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constraintList pre2, constraintList post1) +static /*@only@*/ constraintList +reflectChangesEnsuresFree1 (/*@only@*/ constraintList pre2, constraintList post1) { - constraintList ret; - - ret = reflectChangesEnsures (pre2, post1); - + constraintList ret = reflectChangesEnsures (pre2, post1); constraintList_free(pre2); - return ret; } static bool constraint_conflict (constraint c1, constraint c2) { + llassert (constraint_isDefined (c1)); + llassert (constraint_isDefined (c2)); - llassert(constraint_isDefined(c1) ); - llassert(constraint_isDefined(c2) ); - - if (constraintExpr_similar(c1->lexpr, c2->lexpr) ) + if (constraintExpr_similar (c1->lexpr, c2->lexpr)) { - if (c1->ar == EQ) - if (c1->ar == c2->ar) - { - DPRINTF ((message ("%s conflicts with %s ", constraint_print (c1), constraint_print(c2) ) ) ); - return TRUE; - } + if (c1->ar == EQ && (c1->ar == c2->ar)) + { + DPRINTF (("%s conflicts with %s ", constraint_unparse (c1), constraint_unparse(c2))); + return TRUE; + } } - - /* This is a slight kludg to prevent circular constraints like - strlen(str) == maxRead(s) + strlen(str); + + /* + ** This is a slight kludge to prevent circular constraints like + ** strlen(str) == maxRead(s) + strlen(str); */ - - /*@i324234*/ /*this code is functional but it may be worth cleaning up at some point. */ - if (c1->ar == EQ) - if (c1->ar == c2->ar) - { - if (constraintExpr_search (c1->lexpr, c2->expr) ) - if (constraintExpr_isTerm(c1->lexpr) ) + if (c1->ar == EQ && (c1->ar == c2->ar)) + { + if (constraintExpr_search (c1->lexpr, c2->expr)) + { + if (constraintExpr_isTerm (c1->lexpr)) { - constraintTerm term; + constraintTerm term = constraintExpr_getTerm (c1->lexpr); - term = constraintExpr_getTerm(c1->lexpr); - - if (constraintTerm_isExprNode(term) ) + if (constraintTerm_isExprNode (term)) { - DPRINTF ((message ("%s conflicts with %s ", constraint_print (c1), constraint_print(c2) ) ) ); + DPRINTF (("%s conflicts with %s ", constraint_unparse (c1), + constraint_unparse (c2))); return TRUE; } } - } - - if (constraint_tooDeep(c1) || constraint_tooDeep(c2) ) - { - DPRINTF ((message ("%s conflicts with %s (constraint is too deep", constraint_print (c1), constraint_print(c2) ) ) ); - return TRUE; } - - DPRINTF ((message ("%s doesn't conflict with %s ", constraint_print (c1), constraint_print(c2) ) ) ); + } + if (constraint_tooDeep (c1) || constraint_tooDeep (c2)) + { + DPRINTF (("%s conflicts with %s (constraint is too deep)", + constraint_unparse (c1), constraint_unparse (c2))); + return TRUE; + } + + DPRINTF (("%s doesn't conflict with %s", + constraint_unparse (c1), constraint_unparse (c2))); return FALSE; - } -static void constraint_fixConflict (/*@temp@*/ constraint good, /*@temp@*/ /*@observer@*/ constraint conflicting) /*@modifies good@*/ +static void +constraint_fixConflict (/*@temp@*/ constraint good, + /*@temp@*/ /*@observer@*/ constraint conflicting) + /*@modifies good@*/ { - llassert(constraint_isDefined(conflicting) ); + llassert (constraint_isDefined (conflicting)); - if (conflicting->ar ==EQ ) + if (conflicting->ar ==EQ) { - llassert(constraint_isDefined(good) ); + llassert (constraint_isDefined (good)); good->expr = constraintExpr_searchandreplace (good->expr, conflicting->lexpr, conflicting->expr); good = constraint_simplify (good); } - - } static bool conflict (constraint c, constraintList list) { - constraintList_elements (list, el) { - if ( constraint_conflict(el, c) ) + if (constraint_conflict (el, c)) { constraint_fixConflict (el, c); return TRUE; } } end_constraintList_elements; - - return FALSE; - + + return FALSE; } /* - check if constraint in list1 conflicts with constraints in List2. If so we - remove form list1 and change list2. +** Check if constraint in list1 conflicts with constraints in List2. If so we +** remove form list1 and change list2. */ constraintList constraintList_fixConflicts (constraintList list1, constraintList list2) { - constraintList ret; - ret = constraintList_makeNew(); - llassert(constraintList_isDefined(list1) ); + constraintList ret = constraintList_makeNew (); + llassert (constraintList_isDefined (list1)); + constraintList_elements (list1, el) { - if (! conflict (el, list2) ) + if (!conflict (el, list2)) { - constraint temp; - temp = constraint_copy(el); + constraint temp = constraint_copy (el); ret = constraintList_add (ret, temp); } } end_constraintList_elements; - - return ret; + + return ret; } -/*returns true if constraint post satifies cosntriant pre */ +/* Returns true if constraint post satifies constraint pre */ static bool satifies (constraint pre, constraint post) { - llassert(constraint_isDefined(pre) ); - llassert(constraint_isDefined(post) ); + llassert (constraint_isDefined (pre)); + llassert (constraint_isDefined (post)); - if (constraint_isAlwaysTrue (pre) ) - return TRUE; + if (constraint_isAlwaysTrue (pre)) + { + return TRUE; + } - if (!constraintExpr_similar (pre->lexpr, post->lexpr) ) + if (!constraintExpr_similar (pre->lexpr, post->lexpr)) { - return FALSE; + return TRUE; } - if (constraintExpr_isUndefined(post->expr)) + + if (!constraintExpr_similar (pre->lexpr, post->lexpr)) { - llassert(FALSE); return FALSE; } - + + llassertretval (!constraintExpr_isUndefined (post->expr), FALSE); return rangeCheck (pre->ar, pre->expr, post->ar, post->expr); } - -bool constraintList_resolve (/*@temp@*/ /*@observer@*/ constraint c, /*@temp@*/ /*@observer@*/ constraintList p) +bool +constraintList_resolve (/*@observer@*/ constraint c, + /*@observer@*/ constraintList p) { constraintList_elements (p, el) { - if ( satifies (c, el) ) + if (satifies (c, el)) { - DPRINTF ((message ("\n%s Satifies %s\n ", constraint_print(el), constraint_print(c) ) ) ); + DPRINTF (("%s satifies %s", constraint_unparse (el), constraint_unparse(c))); return TRUE; } - DPRINTF ((message ("\n%s does not satify %s\n ", constraint_print(el), constraint_print(c) ) ) ); - } - end_constraintList_elements; - DPRINTF ((message ("no constraints satify %s", constraint_print(c) ) )); + DPRINTF (("%s does not satify %s", constraint_unparse (el), constraint_unparse (c))); + } end_constraintList_elements; + + DPRINTF (("no constraints satisfy %s", constraint_unparse (c))); return FALSE; } @@ -793,7 +742,7 @@ static bool arithType_canResolve (arithType ar1, arithType ar2) { case GTE: case GT: - if ((ar2 == GT) || (ar2 == GTE) || (ar2 == EQ) ) + if ((ar2 == GT) || (ar2 == GTE) || (ar2 == EQ)) { return TRUE; } @@ -806,7 +755,7 @@ static bool arithType_canResolve (arithType ar1, arithType ar2) case LT: case LTE: - if ((ar2 == LT) || (ar2 == LTE) || (ar2 == EQ) ) + if ((ar2 == LT) || (ar2 == LTE) || (ar2 == EQ)) return TRUE; break; default: @@ -815,46 +764,54 @@ static bool arithType_canResolve (arithType ar1, arithType ar2) return FALSE; } -/*checks for the case expr2 == sizeof buf1 and buf1 is a fixed array*/ +/* Checks for the case expr2 == sizeof buf1 and buf1 is a fixed array*/ static bool sizeofBufComp(constraintExpr buf1, constraintExpr expr2) { constraintTerm ct; exprNode e, t; sRef s1, s2; - llassert(constraintExpr_isDefined(buf1) && constraintExpr_isDefined(expr2) ); + llassert (constraintExpr_isDefined (buf1) && constraintExpr_isDefined (expr2)); + /*@i6343 rewrite this to not need access, or move to constraintExpr module */ /*@access constraintExpr@*/ - if ((expr2->kind != term) && (buf1->kind != term) ) - return FALSE; - + if ((expr2->kind != term) && (buf1->kind != term)) + { + return FALSE; + } ct = constraintExprData_termGetTerm(expr2->data); + + if (!constraintTerm_isExprNode(ct)) + { + return FALSE; + } - if (!constraintTerm_isExprNode(ct) ) - return FALSE; - - e = constraintTerm_getExprNode(ct); - - llassert(exprNode_isDefined(e) ); - - if (! (exprNode_isDefined(e) ) ) - return FALSE; + e = constraintTerm_getExprNode (ct); + + llassert (exprNode_isDefined(e)); + + if (!exprNode_isDefined (e)) + { + return FALSE; + } if (e->kind != XPR_SIZEOF) - return FALSE; + { + return FALSE; + } t = exprData_getSingle (e->edata); - s1 = exprNode_getSref (t); - s2 = constraintTerm_getsRef(constraintExprData_termGetTerm(buf1->data) ); + s1 = exprNode_getSref (t); + s2 = constraintTerm_getsRef(constraintExprData_termGetTerm(buf1->data)); /*@i223@*/ /*this may be the wronge thing to test for */ - if (sRef_similarRelaxed(s1, s2) || sRef_sameName (s1, s2) ) + if (sRef_similarRelaxed(s1, s2) || sRef_sameName (s1, s2)) { /*@i22*/ /* get rid of this test of now */ - /* if (ctype_isFixedArray (sRef_getType (s2) ) ) */ + /* if (ctype_isFixedArray (sRef_getType (s2))) */ return TRUE; } return FALSE; @@ -869,22 +826,23 @@ static bool sizeofBufComp(constraintExpr buf1, constraintExpr expr2) static bool sizeOfMaxSet( /*@observer@*/ /*@temp@*/ constraint c) { constraintExpr l, r, buf1, buf2, con; + + DPRINTF (("sizeOfMaxSet: checking %s ", constraint_unparse (c))); + llassert (constraint_isDefined (c)); - DPRINTF(( message("sizeOfMaxSet: checking %s ", constraint_print(c) ) - )); - - llassert (constraint_isDefined(c) ); - l = c->lexpr; r = c->expr; + + if (!((c->ar == EQ) || (c->ar == GTE) || (c->ar == LTE))) + { + return FALSE; + } - if (!((c->ar == EQ) || (c->ar == GTE) || (c->ar == LTE) ) ) - return FALSE; + llassert (constraintExpr_isDefined (l)); + llassert (constraintExpr_isDefined (r)); - llassert (constraintExpr_isDefined(l) ); - llassert (constraintExpr_isDefined(r) ); + /* Check if the constraintExpr is MaxSet(buf) */ - /*check if the constraintExpr is MaxSet(buf) */ if (l->kind == unaryExpr) { if (constraintExprData_unaryExprGetOp(l->data) == MAXSET) @@ -892,61 +850,60 @@ static bool sizeOfMaxSet( /*@observer@*/ /*@temp@*/ constraint c) buf1 = constraintExprData_unaryExprGetExpr(l->data); } else - return FALSE; + { + return FALSE; + } } else - return FALSE; - + { + return FALSE; + } if (r->kind != binaryexpr) - return FALSE; + { + return FALSE; + } - buf2 = constraintExprData_binaryExprGetExpr1(r->data); - con = constraintExprData_binaryExprGetExpr2(r->data); + buf2 = constraintExprData_binaryExprGetExpr1 (r->data); + con = constraintExprData_binaryExprGetExpr2 (r->data); - if (constraintExprData_binaryExprGetOp(r->data) == BINARYOP_MINUS) + if (constraintExprData_binaryExprGetOp (r->data) == BINARYOP_MINUS) { - if (constraintExpr_canGetValue(con) ) + if (constraintExpr_canGetValue (con)) { - long i; - - i = constraintExpr_getValue(con); + long i = constraintExpr_getValue (con); + if (i != 1) { return FALSE; } } else - return FALSE; + { + return FALSE; + } } - if (constraintExprData_binaryExprGetOp(r->data) == BINARYOP_PLUS) + if (constraintExprData_binaryExprGetOp (r->data) == BINARYOP_PLUS) { - if (constraintExpr_canGetValue(con) ) + if (constraintExpr_canGetValue (con)) { - long i; + long i = constraintExpr_getValue (con); - i = constraintExpr_getValue(con); if (i != -1) { return FALSE; } } else - return FALSE; - } - - if (sizeofBufComp(buf1, buf2)) - { - return TRUE; + { + return FALSE; + } } - else - { - return FALSE; - } - - + + return (sizeofBufComp (buf1, buf2)); } +/*@i8423@*/ /*@noaccess constraintExpr@*/ /* We look for constraint which are tautologies */ @@ -957,18 +914,17 @@ bool constraint_isAlwaysTrue (/*@observer@*/ /*@temp@*/ constraint c) bool rHasConstant; int rConstant; - - llassert (constraint_isDefined(c) ); + llassert (constraint_isDefined (c)); l = c->lexpr; r = c->expr; - DPRINTF(( message("constraint_IsAlwaysTrue:examining %s", constraint_print(c) ) )); + DPRINTF((message("constraint_IsAlwaysTrue:examining %s", constraint_unparse(c)))); - if (sizeOfMaxSet(c) ) + if (sizeOfMaxSet(c)) return TRUE; - if (constraintExpr_canGetValue(l) && constraintExpr_canGetValue(r) ) + if (constraintExpr_canGetValue(l) && constraintExpr_canGetValue(r)) { int cmp; cmp = constraintExpr_compare (l, r); @@ -992,7 +948,7 @@ bool constraint_isAlwaysTrue (/*@observer@*/ /*@temp@*/ constraint c) } } - if (constraintExpr_similar (l,r) ) + if (constraintExpr_similar (l,r)) { switch (c->ar) { @@ -1016,10 +972,10 @@ bool constraint_isAlwaysTrue (/*@observer@*/ /*@temp@*/ constraint c) r = constraintExpr_propagateConstants (r, &rHasConstant, &rConstant); - if (constraintExpr_similar (l,r) && (rHasConstant ) ) + if (constraintExpr_similar (l,r) && (rHasConstant)) { - DPRINTF(( message("constraint_IsAlwaysTrue: after removing constants %s and %s are similar", constraintExpr_unparse(l), constraintExpr_unparse(r) ) )); - DPRINTF(( message("constraint_IsAlwaysTrue: rconstant is %d", rConstant ) )); + DPRINTF((message("constraint_IsAlwaysTrue: after removing constants %s and %s are similar", constraintExpr_unparse(l), constraintExpr_unparse(r)))); + DPRINTF((message("constraint_IsAlwaysTrue: rconstant is %d", rConstant))); constraintExpr_free(l); constraintExpr_free(r); @@ -1047,7 +1003,7 @@ bool constraint_isAlwaysTrue (/*@observer@*/ /*@temp@*/ constraint c) { constraintExpr_free(l); constraintExpr_free(r); - DPRINTF(( message("Constraint %s is not always true", constraint_print(c) ) )); + DPRINTF((message("Constraint %s is not always true", constraint_unparse(c)))); return FALSE; } @@ -1057,20 +1013,20 @@ bool constraint_isAlwaysTrue (/*@observer@*/ /*@temp@*/ constraint c) static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arithType ar2, /*@observer@*/ constraintExpr expr2) { - DPRINTF ((message ("Doing Range CHECK %s and %s", constraintExpr_unparse(expr1), constraintExpr_unparse(expr2) ) )); + DPRINTF ((message ("Doing Range CHECK %s and %s", constraintExpr_unparse(expr1), constraintExpr_unparse(expr2)))); - if (! arithType_canResolve (ar1, ar2) ) + if (! arithType_canResolve (ar1, ar2)) return FALSE; switch (ar1) { case GTE: - if (constraintExpr_similar (expr1, expr2) ) + if (constraintExpr_similar (expr1, expr2)) return TRUE; /*@fallthrough@*/ case GT: if (! (constraintExpr_canGetValue (expr1) && - constraintExpr_canGetValue (expr2) ) ) + constraintExpr_canGetValue (expr2))) { constraintExpr e1, e2; bool p1, p2; @@ -1092,7 +1048,7 @@ static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arit const2 = 0; if (const1 <= const2) - if (constraintExpr_similar (e1, e2) ) + if (constraintExpr_similar (e1, e2)) { constraintExpr_free(e1); constraintExpr_free(e2); @@ -1111,17 +1067,17 @@ static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arit return FALSE; case EQ: - if (constraintExpr_similar (expr1, expr2) ) + if (constraintExpr_similar (expr1, expr2)) return TRUE; return FALSE; case LTE: - if (constraintExpr_similar (expr1, expr2) ) + if (constraintExpr_similar (expr1, expr2)) return TRUE; /*@fallthrough@*/ case LT: if (! (constraintExpr_canGetValue (expr1) && - constraintExpr_canGetValue (expr2) ) ) + constraintExpr_canGetValue (expr2))) { constraintExpr e1, e2; bool p1, p2; @@ -1143,7 +1099,7 @@ static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arit const2 = 0; if (const1 >= const2) - if (constraintExpr_similar (e1, e2) ) + if (constraintExpr_similar (e1, e2)) { constraintExpr_free(e1); constraintExpr_free(e2); @@ -1163,29 +1119,27 @@ static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arit return FALSE; default: - llcontbug((message("Unhandled case in switch: %q", arithType_print(ar1) ) ) ); + llcontbug((message("Unhandled case in switch: %q", arithType_print(ar1)))); } BADEXIT; } static constraint constraint_searchandreplace (/*@returned@*/ constraint c, constraintExpr old, constraintExpr newExpr) { - llassert (constraint_isDefined(c) ); + llassert (constraint_isDefined (c)); + DPRINTF (("Doing replace for lexpr")); - DPRINTF (("Doing replace for lexpr") ); - c->lexpr = constraintExpr_searchandreplace (c->lexpr, old, newExpr); - DPRINTF (("Doing replace for expr") ); + DPRINTF (("Doing replace for expr")); c->expr = constraintExpr_searchandreplace (c->expr, old, newExpr); return c; } bool constraint_search (constraint c, constraintExpr old) /*@*/ { - bool ret; - ret = FALSE; + bool ret = FALSE; - llassert (constraint_isDefined(c) ); + llassert (constraint_isDefined (c)); ret = constraintExpr_search (c->lexpr, old); ret = ret || constraintExpr_search (c->expr, old); @@ -1197,86 +1151,79 @@ static constraint constraint_adjust (/*@returned@*/ constraint substitute, /*@ob { fileloc loc1, loc2, loc3; - DPRINTF ((message("Start adjust on %s and %s", constraint_print(substitute), - constraint_print(old)) - )); + DPRINTF (("Start adjust on %s and %s", constraint_unparse (substitute), + constraint_unparse (old))); - llassert(constraint_isDefined(substitute)); - llassert(constraint_isDefined(old)); + llassert (constraint_isDefined (substitute)); + llassert (constraint_isDefined (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 (constraintExpr_search (substitute->expr, substitute->lexpr)) + { if (fileloc_closer (loc1, loc3, loc2)) - { - 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); - } - + { + constraintExpr temp; + DPRINTF (("Doing adjust on %s", constraint_unparse(substitute))); + temp = substitute->lexpr; + substitute->lexpr = substitute->expr; + substitute->expr = temp; + substitute = constraint_simplify(substitute); + } + } + fileloc_free (loc1); fileloc_free (loc2); fileloc_free (loc3); - return substitute; - } -/* If function preforms substitutes based on inequality - - It uses the rule x >= y && b < y ===> x >= b + 1 - - Warning this is sound but throws out information - */ +/* +** If function preforms substitutes based on inequality +** It uses the rule x >= y && b < y ===> x >= b + 1 +** warning this is sound but throws out information. +*/ -constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p) +constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p) { - llassert(constraint_isDefined(c) ); - + llassert (constraint_isDefined (c)); + if (c->ar != GTE) - return c; + { + return c; + } constraintList_elements (p, el) { + llassert (constraint_isDefined (el)); - llassert(constraint_isDefined(el) ); - - if ((el->ar == LT ) ) - /* if (!constraint_conflict (c, el) ) */ /*@i523 explain this! */ - { - constraintExpr temp2; - - /*@i22*/ - - if (constraintExpr_same (el->expr, c->expr) ) - { - DPRINTF((message ("inequalitySubstitute Replacing %q in %q with %q", - constraintExpr_print (c->expr), - constraint_print (c), - constraintExpr_print (el->expr) ) - )); - temp2 = constraintExpr_copy (el->lexpr); - constraintExpr_free(c->expr); - c->expr = constraintExpr_makeIncConstraintExpr (temp2); - - } - - } - } - end_constraintList_elements; - - c = constraint_simplify(c); + if ((el->ar == LT )) + /* if (!constraint_conflict (c, el) ) */ /*@i523 explain this! */ + { + constraintExpr temp2; + + /*@i22*/ + + if (constraintExpr_same (el->expr, c->expr)) + { + DPRINTF (("inequalitySubstitute Replacing %q in %q with %q", + constraintExpr_print (c->expr), + constraint_unparse (c), + constraintExpr_print (el->expr))); + temp2 = constraintExpr_copy (el->lexpr); + constraintExpr_free(c->expr); + c->expr = constraintExpr_makeIncConstraintExpr (temp2); + } + } + } end_constraintList_elements; + + c = constraint_simplify (c); return c; } - /* drl7x 7/26/001 THis function is like inequalitySubstitute but it adds the rule @@ -1287,58 +1234,60 @@ constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p if we're oring constraints. */ -static constraint inequalitySubstituteStrong (/*@returned@*/ constraint c, constraintList p) +static constraint inequalitySubstituteStrong (/*@returned@*/ constraint c, constraintList p) { - DPRINTF (( message ("inequalitySubstituteStrong examining substituting for %q", constraint_print(c) ) )); + DPRINTF (("inequalitySubstituteStrong examining substituting for %q", constraint_unparse(c))); + llassert (constraint_isDefined (c)); - llassert(constraint_isDefined(c) ); - - if (! (constraint_isDefined(c) ) ) - { - return c; - } + if (!constraint_isDefined (c)) + { + return c; + } if (c->ar != GTE) - return c; + { + return c; + } - DPRINTF (( message ("inequalitySubstituteStrong examining substituting for %q with %q", - constraint_print(c), constraintList_print(p) ) )); + DPRINTF (("inequalitySubstituteStrong examining substituting for %q with %q", + constraint_unparse (c), constraintList_unparse (p))); + constraintList_elements (p, el) { - - DPRINTF (( message ("inequalitySubstituteStrong examining substituting %s on %s", constraint_print(el), constraint_print(c) ) )); + DPRINTF (("inequalitySubstituteStrong examining substituting %s on %s", + constraint_unparse (el), constraint_unparse (c))); - llassert(constraint_isDefined(el) ); - if ((el->ar == LT ) || (el->ar == LTE ) ) + llassert (constraint_isDefined (el)); + + if ((el->ar == LT ) || (el->ar == LTE)) /* if (!constraint_conflict (c, el) ) */ /*@i523@*/ - { - constraintExpr temp2; - - /*@i22*/ - - if (constraintExpr_same (el->lexpr, c->expr) ) - { - DPRINTF((message ("inequalitySubstitute Replacing %s in %s with %s", - constraintExpr_print (c->expr), - constraint_print (c), - constraintExpr_print (el->expr) ) - )); - temp2 = constraintExpr_copy (el->expr); - constraintExpr_free(c->expr); - if ((el->ar == LTE ) ) - { - c->expr = temp2; - } - else - { - c->expr = constraintExpr_makeIncConstraintExpr (temp2); - } - } - - } - } - end_constraintList_elements; + { + constraintExpr temp2; + + /*@i22*/ + if (constraintExpr_same (el->lexpr, c->expr)) + { + DPRINTF (("inequalitySubstitute Replacing %s in %s with %s", + constraintExpr_print (c->expr), + constraint_unparse (c), + constraintExpr_print (el->expr))); + temp2 = constraintExpr_copy (el->expr); + constraintExpr_free (c->expr); + + if ((el->ar == LTE)) + { + c->expr = temp2; + } + else + { + c->expr = constraintExpr_makeIncConstraintExpr (temp2); + } + } + + } + } end_constraintList_elements; + c = constraint_simplify(c); return c; } @@ -1351,129 +1300,110 @@ static constraint inequalitySubstituteStrong (/*@returned@*/ constraint c, con Like inequalitySubstitute we're throwing away some information */ -static constraint inequalitySubstituteUnsound (/*@returned@*/ constraint c, constraintList p) +static constraint inequalitySubstituteUnsound (/*@returned@*/ constraint c, constraintList p) { - DPRINTF (( message ("Doing inequalitySubstituteUnsound " ) )); - - llassert(constraint_isDefined(c) ); + DPRINTF (("Doing inequalitySubstituteUnsound")); + llassert (constraint_isDefined (c)); if (c->ar != GTE) - return c; + { + return c; + } constraintList_elements (p, el) { - - llassert(constraint_isDefined(el) ); - - DPRINTF (( message ("inequalitySubstituteUnsound examining substituting %s on %s", constraint_print(el), constraint_print(c) ) )); - if (( el->ar == LTE) || (el->ar == LT) ) - /* if (!constraint_conflict (c, el) ) */ /*@i532@*/ - { - constraintExpr temp2; - - temp2 = constraintExpr_copy (el->expr); - - if (el->ar == LT) - temp2 = constraintExpr_makeDecConstraintExpr (temp2); - - DPRINTF((message ("Replacing %s in %s with %s", - constraintExpr_print (el->lexpr), - constraintExpr_print (c->lexpr), - constraintExpr_print (temp2) ) )); - - c->lexpr = constraintExpr_searchandreplace (c->lexpr, el->lexpr, temp2); - constraintExpr_free(temp2); - } - } - end_constraintList_elements; - - c = constraint_simplify(c); + llassert (constraint_isDefined (el)); + + DPRINTF (("inequalitySubstituteUnsound examining substituting %s on %s", + constraint_unparse (el), constraint_unparse (c))); + if (( el->ar == LTE) || (el->ar == LT)) + /* if (!constraint_conflict (c, el) ) */ /*@i532@*/ + { + constraintExpr temp2 = constraintExpr_copy (el->expr); + + if (el->ar == LT) + { + temp2 = constraintExpr_makeDecConstraintExpr (temp2); + } + + DPRINTF (("Replacing %s in %s with %s", + constraintExpr_print (el->lexpr), + constraintExpr_print (c->lexpr), + constraintExpr_print (temp2))); + + c->lexpr = constraintExpr_searchandreplace (c->lexpr, el->lexpr, temp2); + constraintExpr_free(temp2); + } + } end_constraintList_elements; + + c = constraint_simplify (c); return c; } /*@only@*/ constraint constraint_substitute (/*@observer@*/ /*@temp@*/ constraint c, constraintList p) { - constraint ret; - - ret = constraint_copy(c); + constraint ret = constraint_copy (c); + constraintList_elements (p, el) { - llassert(constraint_isDefined(el) ); - if ( el->ar == EQ) - if (!constraint_conflict (ret, el) ) - - { - constraint temp; - - temp = constraint_copy(el); - - temp = constraint_adjust(temp, ret); - - llassert(constraint_isDefined(temp) ); - - - DPRINTF((message ("constraint_substitute :: Substituting in %s using %s", - constraint_print (ret), constraint_print (temp) - ) ) ); - - - ret = constraint_searchandreplace (ret, temp->lexpr, temp->expr); - DPRINTF(( message (" constraint_substitute :: The new constraint is %s", constraint_print (ret) ) )); - constraint_free(temp); - } - } - end_constraintList_elements; - - ret = constraint_simplify(ret); - - DPRINTF(( message (" constraint_substitute :: The final new constraint is %s", constraint_print (ret) ) )); - + llassert (constraint_isDefined (el)); + if (el->ar == EQ) + { + if (!constraint_conflict (ret, el)) + { + constraint temp = constraint_copy (el); + temp = constraint_adjust (temp, ret); + + llassert (constraint_isDefined (temp)); + + DPRINTF (("constraint_substitute :: Substituting in %s using %s", + constraint_unparse (ret), constraint_unparse (temp))); + + ret = constraint_searchandreplace (ret, temp->lexpr, temp->expr); + + DPRINTF (("constraint_substitute :: The new constraint is %s", constraint_unparse (ret))); + constraint_free (temp); + } + } + } end_constraintList_elements; + + ret = constraint_simplify (ret); + DPRINTF (("constraint_substitute :: The final new constraint is %s", constraint_unparse (ret))); return ret; } - -/*@only@*/ constraintList constraintList_substituteFreeTarget (/*@only@*/ constraintList target, /*@observer@*/ constraintList subList) +/*@only@*/ constraintList +constraintList_substituteFreeTarget (/*@only@*/ constraintList target, + /*@observer@*/ constraintList subList) { -constraintList ret; - -ret = constraintList_substitute (target, subList); - -constraintList_free(target); - -return ret; + constraintList ret = constraintList_substitute (target, subList); + constraintList_free(target); + return ret; } /* we try to do substitutions on each constraint in target using the constraint in sublist*/ -/*@only@*/ constraintList constraintList_substitute (constraintList target,/*2observer@*/ constraintList subList) +/*@only@*/ constraintList +constraintList_substitute (constraintList target, /*@observer@*/ constraintList subList) { - - constraintList ret; - - ret = constraintList_makeNew(); + constraintList ret = constraintList_makeNew(); constraintList_elements(target, el) - { - constraint temp; - /* drl possible problem : warning make sure that a side effect is not expected */ - - temp = constraint_substitute(el, subList); - ret = constraintList_add (ret, temp); - } - end_constraintList_elements; + { + constraint temp = constraint_substitute (el, subList); + /*@i3232@*/ /* drl possible problem : warning make sure that a side effect is not expected */ + ret = constraintList_add (ret, temp); + } end_constraintList_elements; return ret; } static constraint constraint_solve (/*@returned@*/ constraint c) { - - llassert(constraint_isDefined(c) ); - - DPRINTF((message ("Solving %s\n", constraint_print(c) ) ) ); + llassert (constraint_isDefined (c)); + DPRINTF (("Solving %s", constraint_unparse (c))); c->expr = constraintExpr_solveBinaryExpr (c->lexpr, c->expr); - DPRINTF((message ("Solved and got %s\n", constraint_print(c) ) ) ); - + DPRINTF (("Solved and got %s", constraint_unparse (c))); return c; } @@ -1481,132 +1411,112 @@ static arithType flipAr (arithType ar) { switch (ar) { - case LT: - return GT; - case LTE: - return GTE; - case EQ: - return EQ; - case GT: - return LT; - case GTE: - return LTE; - default: - llcontbug (message("unexpected value: case not handled")); + case LT: return GT; + case LTE: return GTE; + case EQ: return EQ; + case GT: return LT; + case GTE: return LTE; + default: llcontbuglit ("unexpected value: case not handled"); } BADEXIT; } -static constraint constraint_swapLeftRight (/*@returned@*/ constraint c) +static constraint constraint_swapLeftRight (/*@returned@*/ constraint c) { constraintExpr temp; - llassert(constraint_isDefined(c) ); + llassert (constraint_isDefined (c)); c->ar = flipAr (c->ar); temp = c->lexpr; c->lexpr = c->expr; c->expr = temp; - DPRINTF(("Swaped left and right sides of constraint")); + DPRINTF (("Swaped left and right sides of constraint")); return c; } - - -constraint constraint_simplify ( /*@returned@*/ constraint c) +constraint constraint_simplify (/*@returned@*/ constraint c) { - - llassert(constraint_isDefined(c) ); - - DPRINTF(( message("constraint_simplify on %q ", constraint_print(c) ) )); + llassert (constraint_isDefined (c)); + DPRINTF (("constraint_simplify on %q ", constraint_unparse (c))); if (constraint_tooDeep(c)) { - DPRINTF(( message("constraint_simplify: constraint to complex aborting %q ", constraint_print(c) ) )); + DPRINTF (("constraint_simplify: constraint to complex aborting %q", constraint_unparse (c))); return c; - } c->lexpr = constraintExpr_simplify (c->lexpr); c->expr = constraintExpr_simplify (c->expr); - if (constraintExpr_isBinaryExpr (c->lexpr) ) + if (constraintExpr_isBinaryExpr (c->lexpr)) { c = constraint_solve (c); - c->lexpr = constraintExpr_simplify (c->lexpr); c->expr = constraintExpr_simplify (c->expr); } - if (constraintExpr_isLit(c->lexpr) && (!constraintExpr_isLit(c->expr) ) ) + if (constraintExpr_isLit(c->lexpr) && (!constraintExpr_isLit(c->expr))) { - c = constraint_swapLeftRight(c); - /*I don't think this will be an infinate loop*/ - c = constraint_simplify(c); + c = constraint_swapLeftRight (c); + /* I don't think this will be an infinite loop */ + c = constraint_simplify (c); } - DPRINTF(( message("constraint_simplify returning %q ", constraint_print(c) ) )); - + DPRINTF (("constraint_simplify returning %q", constraint_unparse (c))); return c; } +/* returns true if fileloc for term1 is closer to file for term2 than term3*/ - - -/* returns true if fileloc for term1 is closer to file for term2 than term3*/ - -bool fileloc_closer (fileloc loc1, fileloc loc2, fileloc loc3) +bool fileloc_closer (fileloc loc1, fileloc loc2, fileloc loc3) { - - if (!fileloc_isDefined (loc1) ) + if (!fileloc_isDefined (loc1)) return FALSE; - - if (!fileloc_isDefined (loc2) ) + + if (!fileloc_isDefined (loc2)) return FALSE; - if (!fileloc_isDefined (loc3) ) + if (!fileloc_isDefined (loc3)) return TRUE; - - - - if (fileloc_equal (loc2, loc3) ) + if (fileloc_equal (loc2, loc3)) return FALSE; - - if (fileloc_equal (loc1, loc2) ) + + if (fileloc_equal (loc1, loc2)) return TRUE; - - if (fileloc_equal (loc1, loc3) ) + + if (fileloc_equal (loc1, loc3)) return FALSE; - - if ( fileloc_lessthan (loc1, loc2) ) - { - if (fileloc_lessthan (loc2, loc3) ) - { - llassert (fileloc_lessthan (loc1, loc3) ); - return TRUE; - } - else - { - return FALSE; - } - } - - if ( !fileloc_lessthan (loc1, loc2) ) - { - if (!fileloc_lessthan (loc2, loc3) ) - { - llassert (!fileloc_lessthan (loc1, loc3) ); - return TRUE; - } - else - { - return FALSE; - } - } - - llassert(FALSE); - return FALSE; + + if (fileloc_lessthan (loc1, loc2)) + { + if (fileloc_lessthan (loc2, loc3)) + { + llassert (fileloc_lessthan (loc1, loc3)); + return TRUE; + } + else + { + return FALSE; + } + } + + if (!fileloc_lessthan (loc1, loc2)) + { + if (!fileloc_lessthan (loc2, loc3)) + { + llassert (!fileloc_lessthan (loc1, loc3)); + return TRUE; + } + else + { + return FALSE; + } + } + + llassert(FALSE); + return FALSE; }