X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/28bf4b0bfd405a2057d865910f8589c54a40f17b..7ac98eb7e62335f5bb191d2c399d7dae5c1e62ab:/src/Headers/ltoken.h

diff --git a/src/Headers/ltoken.h b/src/Headers/ltoken.h
index 685a1bd..78c994f 100644
--- a/src/Headers/ltoken.h
+++ b/src/Headers/ltoken.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2003.
 ** See ../LICENSE for license information.
 **
 */
@@ -7,10 +7,6 @@
 ** ltoken.h
 */
 
-# ifdef NOLCL
-# error "Bad include"
-# endif
-
 # ifndef LTOKEN_H
 # define LTOKEN_H
 
@@ -46,10 +42,10 @@ typedef /*@only@*/ ltoken o_ltoken;
 /*@constant null ltoken ltoken_undefined; @*/
 # define ltoken_undefined  ((ltoken)NULL)
 
-extern /*@falsenull@*/ bool ltoken_isValid (ltoken p_tok);
+extern /*@falsewhennull@*/ bool ltoken_isValid (ltoken p_tok);
 # define ltoken_isValid(t) ((t) != ltoken_undefined)
 
-extern /*@truenull@*/ bool ltoken_isUndefined (ltoken p_tok);
+extern /*@nullwhentrue@*/ bool ltoken_isUndefined (ltoken p_tok);
 # define ltoken_isUndefined(t) ((t) == ltoken_undefined)
 
 extern bool ltoken_isStateDefined (/*@sef@*/ ltoken p_tok) /*@*/ ;
@@ -111,7 +107,7 @@ extern bool ltoken_wasSyn (/*@sef@*/ ltoken p_tok);
 # define ltoken_wasSyn(tok) \
   (ltoken_isValid (tok) ? lsymbol_isDefined ((tok)->rawText) : FALSE)
 
-/*@-namechecks@*/
+/*@-namechecks@*/ /* all of these should start with g_ */
 extern /*@dependent@*/ ltoken ltoken_forall;
 extern /*@dependent@*/ ltoken ltoken_exists;
 extern /*@dependent@*/ ltoken ltoken_true;