*** empty log message ***

[splint.git] / src / lclscan.c

diff --git a/src/lclscan.c b/src/lclscan.c
index 0d99d52b72d3e9c85119d0b4e44c512b368c43f7..3109788829dc928363c9bad20149c74c20046d0a 100644 (file)
--- a/src/lclscan.c
+++ b/src/lclscan.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 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
@@ -17,8 +17,8 @@
 ** 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
 */
 /*
@@ -42,8 +42,8 @@
 **     yet implemented in this version).
 */
 
-# include "lclintMacros.nf"
-# include "llbasic.h"
+# include "splintMacros.nf"
+# include "basic.h"
 
 /*@-redecl@*/ /* from llgrammar.y */
 extern bool g_inTypeDef;
@@ -69,7 +69,7 @@ static /*@dependent@*/ /*@null@*/ char *line;  /* input text */
 static unsigned int lineNumber;                       /* current line number */
 
 ltokenCode yllex (void)
-  /*@globals killed restoretok@*/ 
+  /*@globals killed restoretok@*/ /* only if restore is TRUE */
 {
   lsymbol tokenSym;
 
@@ -80,7 +80,9 @@ ltokenCode yllex (void)
     }
   else
     {
+      /*@-onlyunqglobaltrans@*/
       yllval.ltok = ltoken_copy (LCLScanNextToken ());
+      /*@=onlyunqglobaltrans@*/
     }
 
   tokenSym = ltoken_getText (yllval.ltok);
@@ -109,7 +111,11 @@ ltokenCode yllex (void)
        }
     }
 
+  /*@-onlyunqglobaltrans@*/ /* restoretok not released on non-restore path */
+  /*@-globstate@*/
   return (ltoken_getCode (yllval.ltok));
+  /*@=onlyunqglobaltrans@*/
+  /*@=globstate@*/
 }
 
 /* useful for scanning LCL init files and LSL init files ? */