*** empty log message ***

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

diff --git a/src/Headers/constraintTerm.h b/src/Headers/constraintTerm.h
index 7e9207e25391981759b8c80f57a0ebc4e7d79d6b..14a102b8fed768c600e0a089b7efde62ce2d1d8f 100644 (file)
--- a/src/Headers/constraintTerm.h
+++ b/src/Headers/constraintTerm.h
@@ -11,14 +11,6 @@ typedef union
 
 /*@-namechecks@*/
 
-void constraintTermValue_copy (/*@out@*/ constraintTermValue src, constraintTermValue dst);
-
-/*@-macroassign*/
-
-#define constraintTermValue_copy(dst, src)     ((dst) = (src))
-
-/*@=macroassign*/
-
 typedef enum
 {
   ERRORBADCONSTRAINTTERMTYPE,
@@ -30,28 +22,16 @@ struct _constraintTerm {
   /*@only@*/ fileloc loc;
   constraintTermValue value;
   constraintTermType kind;
-};
+} ;
 
+abst_typedef struct _constraintTerm *constraintTerm;
 
-abst_typedef struct _constraintTerm * constraintTerm;
+/*@i311 shouldn't need this...never null */
+extern bool constraintTerm_isDefined (constraintTerm t) /*@*/ ;
 
 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 /*@unused@*/ /*@truenull@*/ bool constraintTerm_isError (constraintTerm p_e) /*@*/ ;
-
-/*@constant null constraintTerm constraintTerm_undefined; @*/
-
-# define constraintTerm_undefined ((constraintTerm)NULL)
-
-# define constraintTerm_isDefined(e)        ((e) != constraintTerm_undefined)
-# define constraintTerm_isUndefined(e)      ((e) == constraintTerm_undefined)
-# define constraintTerm_isError(e)          ((e) == constraintTerm_undefined)
-
-
-
 void constraintTerm_free (/*@only@*/ constraintTerm term);
 
 constraintTerm constraintTerm_simplify (/*@returned@*/ constraintTerm term) /*@modifies term@*/ ;