/*
** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
** Massachusetts Institute of Technology
**
** This program is free software; you can redistribute it and/or modify it
** 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 information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
** For more information: http://www.splint.org
*/
/*
** idDecl.c
*/
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
# include "basic.h"
/*@only@*/ idDecl
{
if (idDecl_isDefined (t))
{
- cstring_free (t->id);
+ /* don't: functionClauseList_free (t->clauses); */ /* evans 2002-01-03: splint catches this now! */
qtype_free (t->typ);
- /*@!#@#! functionClauseList_free (t->clauses);*/
- sfree (t);
+ cstring_free (t->id);
+
+ /*@-compdestroy@*/ sfree (t); /*@=compdestroy@*/
}
}
{
llassert (idDecl_isDefined (d));
+ DPRINTF (("Replace type: %s / %s", idDecl_unparse (d), ctype_unparse (c)));
qtype_setType (d->typ, c);
return d;
}
return d;
}
+/*
+** evans 2002-02-09: This is a bit of a kludge, but we
+** need it to fix declarations like int (*p)[];
+*/
+
+void
+idDecl_notExpectingFunction (/*@returned@*/ idDecl d)
+{
+ if (idDecl_isDefined (d))
+ {
+ ctype ct = qtype_getType (d->typ);
+
+ if (ctype_isExpFcn (ct))
+ {
+ qtype_setType (d->typ, ctype_dontExpectFunction (ct));
+ }
+ }
+}
+
void
idDecl_addClauses (idDecl d, functionClauseList clauses)
{
llassert (idDecl_isDefined (d));
- llassert (functionClauseList_isUndefined (d->clauses));
- d->clauses = clauses;
+
+ /*
+ DRL comment out llassert:
+
+ This breaks on sometypes of functionPointers.
+ I.e.
+ void (*signal (int sig ) @requires g >= 0 @ ) (int) @requires g >= 0 @ ;
+
+ llassert (functionClauseList_isUndefined (d->clauses));
+
+ */
+
+ if (functionClauseList_isUndefined (d->clauses) )
+ {
+ d->clauses = clauses;
+ }
+ else
+ {
+ functionClauseList_free(d->clauses);
+ d->clauses = clauses;
+ }
}