X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/843806586e6443959ee7e4c9365ef8cf8538b319..9a48d98c204aab98e0cd2d427808654cf280b62e:/src/constraintList.c diff --git a/src/constraintList.c b/src/constraintList.c index 65c243d..625d716 100644 --- a/src/constraintList.c +++ b/src/constraintList.c @@ -1,5 +1,5 @@ /* -** LCLint - annotation-assisted static program checker +** Splint - annotation-assisted static program checker ** Copyright (C) 1994-2000 University of Virginia, ** Massachusetts Institute of Technology ** @@ -17,10 +17,11 @@ ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ** MA 02111-1307, USA. ** -** For information on lclint: lclint-request@cs.virginia.edu -** To report a bug: lclint-bug@cs.virginia.edu -** For more information: http://lclint.cs.virginia.edu +** For information on splint: info@splint.org +** To report a bug: splint-bug@splint.org +** For more information: http://www.splint.org */ + /* ** constraintList.c ** @@ -29,10 +30,9 @@ ** where T has T_equal (or change this) and T_unparse */ -# include "lclintMacros.nf" +# include "splintMacros.nf" # include "llbasic.h" - /*@iter constraintList_elements_private_only (sef constraintList x, yield only constraint el); @*/ # define constraintList_elements_private_only(x, m_el) \ { if (constraintList_isDefined (x)) { int m_ind; constraint *m_elements = &((x)->elements[0]); \ @@ -59,7 +59,7 @@ s->nspace = constraintListBASESIZE; s->elements = (constraint *) dmalloc (sizeof (*s->elements) * constraintListBASESIZE); - + return (s); } @@ -91,7 +91,7 @@ constraintList_add (/*@returned@*/ constraintList s, /*@only@*/ constraint el) llassert (constraintList_isDefined (s)); /*drl7x */ - // el = constraint_simplify (el); + if (constraintList_resolve (el, s) ) { constraint_free (el); @@ -124,7 +124,7 @@ static void constraintList_freeShallow (/*@only@*/ constraintList c) c = NULL; } -/*@only@*/ constraintList constraintList_addList (/*@only@*/ /*@returned@*/ constraintList s, /*@observer@*/ constraintList newList) +/*@only@*/ constraintList constraintList_addList (/*@only@*/ /*@returned@*/ constraintList s, /*@observer@*/ /*@temp@*/ constraintList newList) { llassert(constraintList_isDefined(s) ); llassert(constraintList_isDefined(newList) ); @@ -160,14 +160,97 @@ constraintList constraintList_addListFree (/*@returned@*/ constraintList s, /*@o } -extern /*@only@*/ cstring constraintList_unparse ( /*@observer@*/ constraintList s) /*@*/ +constraintList constraintList_removeSurpressed (/*@only@*/ constraintList s) { - return (constraintList_print(s)); + constraintList ret; + fileloc loc; + llassert(constraintList_isDefined(s) ); + + ret = constraintList_makeNew(); + + constraintList_elements_private_only(s, elem) + { + loc = constraint_getFileloc(elem); + + if (fileloc_isUndefined(loc)) + { + ret = constraintList_add (ret, elem); + } + + else if (context_suppressFlagMsg(FLG_BOUNDSWRITE, loc) ) + { + DPRINTF ((message ("constraintList_removeSurpressed getting rid of surpressed constraint %q", + 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_unparse(elem)))); + constraint_free(elem); + } + else + { + ret = constraintList_add (ret, elem); + } + fileloc_free(loc); + } + end_constraintList_elements_private_only; + + constraintList_freeShallow(s); + + return ret; } +# if 0 +static /*@only@*/ cstring +constraintList_unparseLocation (/*@temp@*/ constraintList s) /*@*/ +{ + int i; + cstring st = cstring_undefined; + bool first = TRUE; + + if (!constraintList_isDefined (s)) + { + return cstring_makeLiteral (""); + } + + if (s->nelements == 0) + { + st = cstring_makeLiteral(""); + return st; + } + + for (i = 0; i < s->nelements; i++) + { + cstring type = cstring_undefined; + constraint current = s->elements[i]; + + if (constraint_isDefined(current) ) + { + cstring temp1; + temp1 = constraint_unparseLocation(current); + type = message ("%q %q\n", type, temp1 ); + } + + if (first) + { + st = type; + first = FALSE; + } + else + { + st = message ("%q, %q", st, type); + } + } + + return st; +} +# endif /*@only@*/ cstring -constraintList_print (/*@temp@*/ constraintList s) /*@*/ +constraintList_unparse (/*@temp@*/ constraintList s) /*@*/ { int i; cstring st = cstring_undefined; @@ -192,10 +275,15 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/ if (constraint_isDefined(current) ) { cstring temp1; - if ( context_getFlag (FLG_ORCONSTRAINT) ) - temp1 = constraint_printOr(current); - else - temp1 = constraint_print(current); + + if (context_getFlag (FLG_ORCONSTRAINT)) + { + temp1 = constraint_unparseOr(current); + } + else + { + temp1 = constraint_unparse (current); + } type = message ("%q %q\n", type, temp1 ); } @@ -208,12 +296,12 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/ { st = message ("%q, %q", st, type); } - } //end for + } return st; } -void constraintList_printErrorPostConditions (constraintList s, fileloc loc) +void constraintList_unparseErrorPostConditions (constraintList s, fileloc loc) { constraintList_elements (s, elem) @@ -227,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) @@ -246,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; @@ -270,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); } @@ -297,9 +385,9 @@ 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)) ) ); + DPRINTF ((message ("Logical or on %s and %s", + constraintList_unparse(l1), + constraintList_unparse(l2)) ) ); ret = constraintList_makeNew(); constraintList_elements (l1, el) @@ -344,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 @@ -377,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) { @@ -389,11 +477,10 @@ 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) { - // el = constraint_preserveOrig (el); el = constraint_setFcnPre(el); el = constraint_origAddGeneratingExpr (el, fcn); } @@ -415,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; @@ -435,6 +522,25 @@ constraintList constraintList_addGeneratingExpr (constraintList c,/*@dependent@* constraintList_free(postconditions); return ret; } +/* +Commenting out because function is not yet stable + +/ *@only@* / constraintList constraintList_doSRefFixStructConstraint(constraintList invars, sRef s, ctype ct ) +{ + constraintList ret; + ret = constraintList_makeNew(); + + constraintList_elements (invars, el) + { + ret = constraintList_add(ret, constraint_doSRefFixInvarConstraint (el, s, ct) ); + } + end_constraintList_elements; + + / * constraintList_free (invars);* / + + return ret; +} +*/ /*@only@*/ constraintList constraintList_doSRefFixConstraintParam (constraintList preconditions, /*@temp@*/ /*@observer@*/ exprNodeList arglist) { @@ -485,12 +591,12 @@ constraintList constraintList_togglePost (/*@returned@*/ constraintList c) /*@only@*/ constraintList constraintList_undump (FILE *f) { constraintList ret; - char *s = mstring_create (MAX_DUMP_LINE_LENGTH); + char *s; char *os; ret = constraintList_makeNew(); - os = s; + os = mstring_create (MAX_DUMP_LINE_LENGTH); s = fgets (os, MAX_DUMP_LINE_LENGTH, f); while (s != NULL && *s != ';') @@ -500,6 +606,12 @@ constraintList constraintList_togglePost (/*@returned@*/ constraintList c) c = reader_getWord(&s); + if (! mstring_isDefined(c) ) + { + llfatalbug(message("Library file is corrupted") ); + } + + if (strcmp (c, "C") != 0) { llfatalbug(message("Error reading library. File may be corrupted")); @@ -529,7 +641,17 @@ void constraintList_dump (/*@observer@*/ constraintList c, FILE *f) constraintList constraintList_sort (/*@returned@*/ constraintList ret) { + if (constraintList_isUndefined(ret) ) + { + llassert(FALSE); + return ret; + } qsort (ret->elements, (size_t) ret->nelements, - (sizeof (*ret->elements) ), constraint_compare); + (sizeof (*ret->elements)), + (int (*)(const void *, const void *)) constraint_compare); + + DPRINTF((message("onstraint_sort returning") )); return ret; } + +