/*
** 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
*/
# include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
# include "lslparse.h"
# include "llgrammar.h" /* need simpleOp, MULOP and logicalOp in makeInfixTermNode */
# include "lclscan.h"
ti->modifiable = FALSE;
ti->abstract = FALSE;
ti->export = FALSE; /* this is implicit, not exported */
- ti->basedOn = sort_float;
+ ti->basedOn = g_sortFloat;
symtable_enterType (g_symtab, ti);
}
ti->modifiable = FALSE;
ti->abstract = TRUE;
- ti->basedOn = sort_bool;
+ ti->basedOn = g_sortBool;
ti->export = FALSE; /* this wasn't set (detected by Splint) */
symtable_enterType (g_symtab, ti);
vi->id = ltoken_createType (simpleId, SID_VAR, lsymbol_fromChars ("FALSE"));
vi->kind = VRK_CONST;
- vi->sort = sort_bool;
+ vi->sort = g_sortBool;
vi->export = TRUE;
(void) symtable_enterVar (g_symtab, vi);
** in makeArrayNode.
*/
- /*@i3@*/ x->content.function.returntype = makeArrayNode (x, a);
- /*@i1@*/ return x;
+ /*@-usereleased@*/
+ x->content.function.returntype = makeArrayNode (x, a);
+ /*@=usereleased@*/
+ /*@-kepttrans@*/
+ return x;
+ /*@=kepttrans@*/
}
else
{
termNodeList_free (t->args);
t->args = termNodeList_new ();
- sort = sort_bool;
+ sort = g_sortBool;
n->sort = sort;
(void) sortSet_insert (n->possibleSorts, sort);
needed anyway. */
/* symtable_enterOp (g_symtab, nn, sign); */
- if (s == sort_int)
+ if (s == g_sortInt)
{
sigNode osign;
lslOp opn = (lslOp) dmalloc (sizeof (*opn));
/* if it is a C int, we should overload it as double too because
C allows you to say "x > 2". */
- (void) sortSet_insert (n->possibleSorts, sort_double);
+ (void) sortSet_insert (n->possibleSorts, g_sortDouble);
ltoken_setText (range, lsymbol_fromChars ("double"));
osign = makesigNode (ltoken_undefined, ltokenList_new (), range);
t->error_reported = FALSE;
t->wrapped = 0;
t->kind = TRM_UNCHANGEDALL;
- t->sort = sort_bool;
+ t->sort = g_sortBool;
t->literal = op;
t->given = sort_makeNoSort ();
t->name = NULL; /*< missing this >*/
t->error_reported = FALSE;
t->wrapped = 0;
t->kind = TRM_UNCHANGEDOTHERS;
- t->sort = sort_bool;
+ t->sort = g_sortBool;
t->literal = op;
t->unchanged = x;
t->given = sort_makeNoSort ();
t->error_reported = FALSE;
t->wrapped = 0;
t->kind = TRM_SIZEOF;
- t->sort = sort_int;
+ t->sort = g_sortInt;
t->literal = op;
t->sizeofField = type;
t->given = sort_makeNoSort ();