Merged with Dave Evans's changes.

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

diff --git a/src/Headers/constraintTerm.h b/src/Headers/constraintTerm.h
index c171af7320b08e803cd3c7e5a94e17b866ac016d..d068871418cce6c2afffab6aeca3522aa255ec1b 100644 (file)
--- a/src/Headers/constraintTerm.h
+++ b/src/Headers/constraintTerm.h
@@ -4,15 +4,19 @@
 
 typedef union
 {
-  exprNode expr;
-  sRef     sref;
+  /*@exposed@*/ exprNode expr;
+  /*@exposed@*/  sRef     sref;
   int      intlit;
 } constraintTermValue;
 
 void constraintTermValue_copy (/*@out@*/ constraintTermValue src, constraintTermValue dst);
 
+/*@-macroassign*/
+
 #define constraintTermValue_copy(dst, src)     ((dst) = (src))
 
+/*@=macroassign*/
+
 typedef enum
 {
   ERRORBADCONSTRAINTTERMTYPE,
@@ -21,20 +25,22 @@ typedef enum
 } constraintTermType;
 
 struct _constraintTerm {
-  fileloc loc;
-  constraintTermValue value;
+  /*@only@*/ fileloc loc;
+   constraintTermValue value;
   constraintTermType kind;
 };
 
 
 abst_typedef struct _constraintTerm * constraintTerm;
 
-
+extern constraintTermType constraintTerm_getKind (constraintTerm) ;
+extern /*@exposed@*/ sRef constraintTerm_getSRef (constraintTerm) ;
 
 extern /*@falsenull@*/ bool constraintTerm_isDefined (constraintTerm p_e) /*@*/;
 extern /*@unused@*/ /*@truenull@*/ bool constraintTerm_isUndefined (constraintTerm p_e) /*@*/ ;
-extern /*@truenull@*/ bool constraintTerm_isError (constraintTerm p_e) /*@*/ ;
+extern /*@unused@*/ /*@truenull@*/ bool constraintTerm_isError (constraintTerm p_e) /*@*/ ;
 
+/*@constant null constraintTerm constraintTerm_undefined; @*/
 
 # define constraintTerm_undefined ((constraintTerm)NULL)
 
@@ -44,17 +50,17 @@ extern /*@truenull@*/ bool constraintTerm_isError (constraintTerm p_e) /*@*/ ;
 
 
 
-
+void constraintTerm_free (/*@only@*/ constraintTerm term);
 
 constraintTerm constraintTerm_simplify (/*@returned@*/ constraintTerm term) /*@modifies term@*/ ;
 
-constraintTerm constraintTerm_makeExprNode (/*@only@*/ exprNode e) /*@*/;
+/*@only@*/ constraintTerm constraintTerm_makeExprNode (/*@exposed@*/ exprNode e) /*@*/;
 
 constraintTerm constraintTerm_copy (constraintTerm term) /*@*/;
 
-constraintTerm exprNode_makeConstraintTerm ( exprNode e) /*@*/;
+//constraintTerm exprNode_makeConstraintTerm ( exprNode e) /*@*/;
 
-bool constraintTerm_same (constraintTerm term1, constraintTerm term2) /*@*/;
+//bool constraintTerm_same (constraintTerm term1, constraintTerm term2) /*@*/;
 
 bool constraintTerm_similar (constraintTerm term1, constraintTerm term2) /*@*/;
 
@@ -63,27 +69,27 @@ int constraintTerm_getValue (constraintTerm term) /*@*/;
 
 fileloc constraintTerm_getFileloc (constraintTerm t) /*@*/;
 
-constraintTerm constraintTerm_makeMaxSetexpr (exprNode e) /*@*/;
+//constraintTerm constraintTerm_makeMaxSetexpr (exprNode e) /*@*/;
 
-constraintTerm constraintTerm_makeMinSetexpr (exprNode e) /*@*/;
+//constraintTerm constraintTerm_makeMinSetexpr (exprNode e) /*@*/;
 
-constraintTerm constraintTerm_makeMaxReadexpr (exprNode e) /*@*/;
+//constraintTerm constraintTerm_makeMaxReadexpr (exprNode e) /*@*/;
 
-constraintTerm constraintTerm_makeMinReadexpr (exprNode e) /*@*/;
+//constraintTerm constraintTerm_makeMinReadexpr (exprNode e) /*@*/;
 
-constraintTerm constraintTerm_makeValueexpr (exprNode e) /*@*/;
+//constraintTerm constraintTerm_makeValueexpr (exprNode e) /*@*/;
 
-constraintTerm intLit_makeConstraintTerm (int i) /*@*/;
+//constraintTerm intLit_makeConstraintTerm (int i) /*@*/;
 
-constraintTerm constraintTerm_makeIntLitValue (int i) /*@*/;
+//constraintTerm constraintTerm_makeIntLitValue (int i) /*@*/;
 
 bool constraintTerm_isIntLiteral (constraintTerm term) /*@*/;
 
 cstring constraintTerm_print (constraintTerm term) /*@*/;
 
-constraintTerm constraintTerm_makesRef  (/*@only@*/ sRef s) /*@*/;
+constraintTerm constraintTerm_makesRef  (/*@exposed@*/ sRef s) /*@*/;
 
-bool constraintTerm_probSame (constraintTerm term1, constraintTerm term2) /*@*/;
+/*@unused@*/ bool constraintTerm_probSame (constraintTerm term1, constraintTerm term2) /*@*/;
 
 constraintTerm constraintTerm_setFileloc (/*@returned@*/ constraintTerm term, fileloc loc) /*@modifies term@*/;
 
@@ -93,8 +99,7 @@ bool constraintTerm_isStringLiteral (constraintTerm c) /*@*/;
 cstring constraintTerm_getStringLiteral (constraintTerm c) /*@*/;
 
 
-constraintTerm 
-constraintTerm_doSRefFixBaseParam (constraintTerm term, exprNodeList arglist) /*@modifies term@*/;
+constraintTerm constraintTerm_doSRefFixBaseParam (/*@returned@*/ constraintTerm term, exprNodeList arglist) /*@modifies term@*/;
 
 #else