** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
** MA 02111-1307, USA.
**
-** For information on splint: splint@cs.virginia.edu
-** To report a bug: splint-bug@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
*/
*/
# include "splintMacros.nf"
-# include "llbasic.h"
-
+# include "basic.h"
/*@iter constraintList_elements_private_only (sef constraintList x, yield only constraint el); @*/
# define constraintList_elements_private_only(x, m_el) \
s->nspace = constraintListBASESIZE;
s->elements = (constraint *)
dmalloc (sizeof (*s->elements) * constraintListBASESIZE);
-
+
return (s);
}
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) );
constraintList constraintList_addListFree (/*@returned@*/ constraintList s, /*@only@*/ constraintList newList)
{
- llassert(constraintList_isDefined(s) );
- llassert(constraintList_isDefined(newList) );
-
- if (constraintList_isUndefined(newList) )
+ if (constraintList_isUndefined (newList))
return s;
+
+ llassert (constraintList_isDefined (s));
+ llassert (constraintList_isDefined (newList));
constraintList_elements_private_only(newList, elem)
{
- s = constraintList_add (s, elem);
- }
- end_constraintList_elements_private_only
-
- constraintList_freeShallow(newList);
- return s;
+ s = constraintList_add (s, elem);
+ } end_constraintList_elements_private_only;
+
+ constraintList_freeShallow (newList);
+ return s;
}
-
constraintList constraintList_removeSurpressed (/*@only@*/ constraintList s)
{
constraintList ret;
fileloc loc;
- llassert(constraintList_isDefined(s) );
+ llassert (constraintList_isDefined (s));
ret = constraintList_makeNew();
- constraintList_elements_private_only(s, elem)
+ constraintList_elements_private_only (s, elem)
{
loc = constraint_getFileloc(elem);
{
ret = constraintList_add (ret, elem);
}
-
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
ret = constraintList_add (ret, elem);
}
fileloc_free(loc);
- }
- end_constraintList_elements_private_only;
+ } end_constraintList_elements_private_only;
constraintList_freeShallow(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;
if (constraint_isDefined(current) )
{
cstring temp1;
- temp1 = constraint_printLocation(current);
+ temp1 = constraint_unparseLocation(current);
type = message ("%q %q\n", type, temp1 );
}
# endif
/*@only@*/ cstring
-constraintList_print (/*@temp@*/ constraintList s) /*@*/
+constraintList_unparse (/*@temp@*/ constraintList s) /*@*/
{
int i;
cstring st = cstring_undefined;
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 );
}
cstring
-constraintList_printDetailed (constraintList s)
+constraintList_unparseDetailed (constraintList s)
{
int i;
cstring st = cstring_undefined;
if (constraint_isDefined(current ) )
{
- cstring temp1 = constraint_printDetailed (current);
+ cstring temp1 = constraint_unparseDetailed (current);
type = message ("%s %s\n", type, temp1 );
cstring_free(temp1);
}
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)
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
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)
{
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)
{
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;
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"));
constraintList constraintList_sort (/*@returned@*/ constraintList ret)
{
+ if (constraintList_isUndefined(ret) )
+ {
+ llassert(FALSE);
+ return ret;
+ }
+
qsort (ret->elements, (size_t) ret->nelements,
(sizeof (*ret->elements)),
(int (*)(const void *, const void *)) constraint_compare);