Fixed all /*@i...@*/ tags (except 1).

[splint.git] / src / ltoken.c

diff --git a/src/ltoken.c b/src/ltoken.c
index 86943935d9b6388e8e4b46eb2f05b61a9ce6beab..5b3a6990fc23ab7faeb82b48fd925e0b5e9582bf 100644 (file)
--- a/src/ltoken.c
+++ b/src/ltoken.c
@@ -1,6 +1,6 @@
 /*
-** 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
@@ -17,16 +17,16 @@
 ** 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"
@@ -37,7 +37,7 @@
 ** 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;
@@ -87,7 +87,7 @@ static /*@notnull@*/ ltoken ltoken_new (void)
   return tok;
 }
 
-ltoken ltoken_create (unsigned int code, lsymbol text)
+ltoken ltoken_create (ltokenCode code, lsymbol text)
 {
   ltoken tok = ltoken_new ();
 
@@ -97,7 +97,7 @@ ltoken ltoken_create (unsigned int code, lsymbol text)
   return tok;
 }
 
-ltoken ltoken_createRaw (unsigned int code, lsymbol text)
+ltoken ltoken_createRaw (ltokenCode code, lsymbol text)
 {
   ltoken tok = ltoken_new ();
 
@@ -107,7 +107,7 @@ ltoken ltoken_createRaw (unsigned int code, lsymbol text)
   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 ();
 
@@ -120,9 +120,9 @@ ltoken ltoken_createType (unsigned int code, SimpleIdCode idtype, lsymbol text)
   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));
   
@@ -138,7 +138,7 @@ ltoken ltoken_createFull (unsigned int code, lsymbol text,
   return tok;
 }
 
-static /*@only@*/ cstring LCLTokenCode_unparseCodeName (unsigned int t)
+static /*@only@*/ cstring LCLTokenCode_unparseCodeName (ltokenCode t)
 {
   switch (t)
     {
@@ -294,15 +294,10 @@ lsymbol ltoken_getRawText (ltoken tok)
 {
   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
     {