X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/34f0c5e711b8f61f6376414948f4c116f1c5a22c..16c024b587f5ddc115928d5cca7095508aa208d9:/src/Headers/lltok.h?ds=sidebyside

diff --git a/src/Headers/lltok.h b/src/Headers/lltok.h
index 317704a..a7d5deb 100644
--- 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,53 +10,69 @@
 # ifndef LLTOK_H
 # define LLTOK_H
 
-typedef struct _lltok
+typedef /*@abstract@*/ struct
 {
   int tok;
   fileloc loc;
-} lltok;
+} *lltok;
 
 extern lltok lltok_create  (int p_tok, /*@only@*/ fileloc p_loc) /*@modifies nothing@*/ ;
 extern /*@observer@*/ cstring lltok_unparse (lltok p_tok) /*@*/ ;
-
-extern void lltok_release (/*@special@*/ lltok p_t) /*@releases p_t.loc@*/ ;
+extern void lltok_free (/*@only@*/ lltok p_t) ;
+extern void lltok_free2 (/*@only@*/ lltok p_t1, /*@only@*/ lltok p_t2) ;
+extern void lltok_free3 (/*@only@*/ lltok p_t1, /*@only@*/ lltok p_t2, /*@only@*/ lltok p_t3) ;
 
 extern /*@dependent@*/ /*@exposed@*/ fileloc lltok_getLoc (lltok p_t) /*@*/ ;
 extern int lltok_getTok (lltok p_t) /*@*/ ;
 
-# define lltok_getTok(t)  ((t).tok)
-# define lltok_getLoc(t)  ((t).loc)
+# define lltok_getTok(t)  ((t)->tok)
+# define lltok_getLoc(t)  ((t)->loc)
 
 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_isEqOp (lltok p_tok);
+extern bool lltok_isNotEqOp (lltok p_tok);
 
-extern bool lltok_isMult (lltok tok);
+extern bool lltok_isMult (lltok p_tok);
 
-extern bool lltok_isInc_Op (lltok tok);
+extern bool lltok_isIncOp (lltok p_tok);
 
-extern bool lltok_isAnd_Op (lltok tok);
+extern bool lltok_isAndOp (lltok p_tok);
 
-extern bool lltok_isOr_Op (lltok tok);
+extern bool lltok_isOrOp (lltok p_tok);
 
-extern bool lltok_isNot_Op (lltok tok);
+extern bool lltok_isNotOp (lltok p_tok);
 
 /*drl7x added this function 11/20/00 */
 
-bool lltok_isLt_Op (lltok tok);
+extern bool lltok_isLt_Op (lltok p_tok);
+extern bool lltok_isGt_Op (lltok p_tok);
+extern bool lltok_isGe_Op (lltok p_tok);
+extern bool lltok_isLe_Op (lltok p_tok);
 
-bool lltok_isGt_Op (lltok tok);
-  
-bool lltok_isGe_Op (lltok tok);
+/* end drl7x added */
 
-bool lltok_isLe_Op (lltok 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_isDecOp  (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);
+
+extern bool lltok_isEnsures (lltok p_tok);
+extern bool lltok_isRequires (lltok p_tok);
 
 # else
 # error "Multiple include"
 # endif
-