/*
-** LCLint - annotation-assisted static program checker
-** Copyright (C) 1994-2000 University of Virginia,
+** Splint - annotation-assisted static program checker
+** 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 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
*/
/*
** ltoken.c
*/
-# include "lclintMacros.nf"
-# include "llbasic.h"
+# include "splintMacros.nf"
+# include "basic.h"
# include "llgrammar.h"
# include "scanline.h"
# include "lclscanline.h"
** set in LCLScanLineInit of lclscanline.c or in scanline.c
*/
-/*@-namechecks@*/
+/*@-namechecks@*/ /* These should all start with g_ */
ltoken ltoken_forall;
ltoken ltoken_exists;
ltoken ltoken_true;
return tok;
}
-ltoken ltoken_create (unsigned int code, lsymbol text)
+ltoken ltoken_create (ltokenCode code, lsymbol text)
{
ltoken tok = ltoken_new ();
return tok;
}
-ltoken ltoken_createRaw (unsigned int code, lsymbol text)
+ltoken ltoken_createRaw (ltokenCode code, lsymbol text)
{
ltoken tok = ltoken_new ();
return tok;
}
-ltoken ltoken_createType (unsigned int code, SimpleIdCode idtype, lsymbol text)
+ltoken ltoken_createType (ltokenCode code, SimpleIdCode idtype, lsymbol text)
{
ltoken tok = ltoken_new ();
return tok;
}
-ltoken ltoken_createFull (unsigned int code, lsymbol text,
- cstring file, unsigned int line,
- unsigned int col)
+ltoken ltoken_createFull (ltokenCode code, lsymbol text,
+ cstring file, int line,
+ int col)
{
ltoken tok = (ltoken) dmalloc (sizeof (*tok));
return tok;
}
-static /*@only@*/ cstring LCLTokenCode_unparseCodeName (unsigned int t)
+static /*@only@*/ cstring LCLTokenCode_unparseCodeName (ltokenCode t)
{
switch (t)
{
{
if (ltoken_getCode (t) != NOTTOKEN)
{
- if (context_getFlag (FLG_SHOWCOL))
- {
- return (message ("%s:%u,%u", ltoken_fileName (t),
- ltoken_getLine (t), ltoken_getCol (t)));
- }
- else
- {
- return (message ("%s:%u", ltoken_fileName (t), ltoken_getLine (t)));
- }
+ cstring res = fileloc_unparseRawCol (ltoken_fileName (t),
+ ltoken_getLine (t),
+ ltoken_getCol (t));
+ return res;
}
else
{