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

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

diff --git a/src/Headers/usymId.h b/src/Headers/usymId.h
index cdd6a37b40f327347a9162a20a1f54154253bd71..65dd6c3484843ae13e362ea7644b46d3ac4f17f5 100644 (file)
--- a/src/Headers/usymId.h
+++ b/src/Headers/usymId.h
@@ -1,18 +1,28 @@
 # ifndef USYMID_H
 # define USYMID_H
 
-/*@i32 make them abstract/? */
-typedef int usymId;
-typedef usymId typeId;
+typedef /*@numabstract@*/ int usymId;
+
+extern usymId usymId_fromInt (int p_i) /*@*/ ;
+# define usymId_fromInt(i)   ((usymId)(i))
+
+extern int usymId_toInt (usymId p_i) /*@*/ ;
+# define usymId_toInt(i)   ((int)(i))
+
+extern bool usymId_isInvalid (usymId p_u) /*@*/ ;
+# define usymId_isInvalid(u) ((u) == usymId_invalid)
+
+extern bool usymId_isValid (usymId p_u) /*@*/ ;
+# define usymId_isValid(u)   ((u) != usymId_invalid)
 
 extern bool usymId_equal (usymId p_u1, usymId p_u2) /*@*/ ;
 # define usymId_equal(u1,u2) ((u1) == (u2))
 
-/*@constant usymId USYMIDINVALID;@*/
-# define USYMIDINVALID -17
+/*@constant usymId usymId_invalid;@*/
+# define usymId_invalid -17
 
-/*@constant typeId typeId_invalid;@*/
-# define typeId_invalid USYMIDINVALID
+/*@constant usymId usymId_notfound;@*/
+# define usymId_notfound NOT_FOUND
 
 # else
 # error "Multiple include"