Merged code tree with Dave Evans's version. Many changes to numberous to list....

[splint.git] / src / Headers / lltok.h

diff --git a/src/Headers/lltok.h b/src/Headers/lltok.h
index 837aa984dda3e89a833ab34ff9ca0f8590ec1c57..52ffe8aa6a54c9e418fa9acd4313cbb669e31cd3 100644 (file)
--- a/src/Headers/lltok.h
+++ b/src/Headers/lltok.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2000.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
 ** See ../LICENSE for license information.
 **
 */
@@ -10,7 +10,7 @@
 # ifndef LLTOK_H
 # define LLTOK_H
 
-typedef struct _lltok
+typedef struct
 {
   int tok;
   fileloc loc;
@@ -22,6 +22,8 @@ extern /*@observer@*/ cstring lltok_unparse (lltok p_tok) /*@*/ ;
 extern void lltok_release (/*@special@*/ lltok p_t) /*@releases p_t.loc@*/ ;
 
 extern /*@dependent@*/ /*@exposed@*/ fileloc lltok_getLoc (lltok p_t) /*@*/ ;
+extern /*@only@*/ fileloc lltok_stealLoc (lltok p_t) /*@releases p_t.loc@*/ ;
+
 extern int lltok_getTok (lltok p_t) /*@*/ ;
 
 # define lltok_getTok(t)  ((t).tok)
@@ -30,9 +32,47 @@ extern int lltok_getTok (lltok p_t) /*@*/ ;
 extern bool lltok_isSemi (lltok p_tok);
 
 /* DRL added 10/23/2000 for boolean stuff */
-extern bool lltok_isEq_Op (lltok tok);
+extern bool lltok_isEq_Op (lltok p_tok);
+
+extern bool lltok_isMult (lltok p_tok);
+
+extern bool lltok_isInc_Op (lltok p_tok);
+
+extern bool lltok_isAnd_Op (lltok p_tok);
+
+extern bool lltok_isOr_Op (lltok p_tok);
+
+extern bool lltok_isNot_Op (lltok p_tok);
+
+/*drl7x added this function 11/20/00 */
+
+bool lltok_isLt_Op (lltok p_tok);
+
+bool lltok_isGt_Op (lltok p_tok);
+  
+bool lltok_isGe_Op (lltok p_tok);
+
+bool lltok_isLe_Op (lltok p_tok);
+
+/* end drl7x added */
+
+
+/*drl7x added 11 30 2000*/
+bool lltok_isPlus_Op (lltok p_tok);
+
+bool lltok_isMinus_Op (lltok p_tok);
+
+/*end drl added */
+
+/*drl
+  added 1/14/2001
+*/
+bool lltok_isDec_Op  (lltok p_tok);
+bool lltok_isAmpersand_Op (lltok p_tok);
+
+extern bool lltok_isExcl_Op (lltok p_tok);
+extern bool lltok_isTilde_Op (lltok p_tok);
 
 # else
 # error "Multiple include"
 # endif
-