Made allocations involving sizeof work correctly (test/malloc.c).

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

diff --git a/src/Headers/constraintExprData.h b/src/Headers/constraintExprData.h
index 8ac86d5fed11b3471ad141ede6bcc0760a27146c..e4a4bec378d39d2b4f35e036960dd8e20b33d267 100644 (file)
--- a/src/Headers/constraintExprData.h
+++ b/src/Headers/constraintExprData.h
@@ -1,24 +1,21 @@
 #ifndef __constraintExprData_h__
-
 #define __constraintExprData_h__
 
-
 typedef enum
 {
   BINARYOP_UNDEFINED,
-  PLUS,
-  MINUS
+  BINARYOP_PLUS,
+  BINARYOP_MINUS
 }
 constraintExprBinaryOpKind;
 
 typedef enum
 {
   UNARYOP_UNDEFINED,
- MAXSET, MINSET, MAXREAD, MINREAD
+  MAXSET, MINSET, MAXREAD, MINREAD 
  }
 constraintExprUnaryOpKind;
 
-
 typedef struct constraintExprBinaryOp_
 {
   constraintExpr expr1;
@@ -26,73 +23,58 @@ typedef struct constraintExprBinaryOp_
   constraintExpr expr2;
 } constraintExprBinaryOp;
 
-
 typedef struct constraintExprUnaryOp_
 {
   constraintExpr expr;
   constraintExprUnaryOpKind unaryOp;
 } constraintExprUnaryOp;
 
-
 typedef union constraintExprData
 {
   constraintExprBinaryOp binaryOp;
   constraintExprUnaryOp unaryOp;
   constraintTerm term;
-}  * constraintExprData;
-
-/*@constant null constraintExprData constraintExprData_undefined; @*/
-# define constraintExprData_undefined ((constraintExprData)NULL)
+} *constraintExprData;
 
-extern /*@falsenull@*/ bool constraintExprData_isDefined ( /*@temp@*/ /*@observer@*/ /*@reldef@*/constraintExprData p_e) /*@*/ ;
-extern /*@unused@*/ /*@truenull@*/ bool constraintExprData_isUndefined (/*2oberserver@*/ constraintExprData p_e) /*@*/ ;
-extern/*@unused@*/ /*@truenull@*/ bool constraintExprData_isError (/*@observer@*/ constraintExprData p_e) /*@*/ ;
-
-# define constraintExprData_isDefined(e)      ((e) != constraintExprData_undefined)
-# define constraintExprData_isUndefined(e)    ((e) == constraintExprData_undefined)
-# define constraintExprData_isError(e)        ((e) == constraintExprData_undefined)
+extern /*@falsewhennull@*/ bool constraintExprData_isDefined (/*@temp@*/ /*@observer@*/ /*@reldef@*/ constraintExprData p_e) /*@*/ ;
+# define constraintExprData_isDefined(e)      ((e) != NULL)
 
 extern void constraintExprData_freeBinaryExpr (/*@only@*/ constraintExprData) ;
 extern void constraintExprData_freeUnaryExpr (/*@only@*/ constraintExprData) ;
 extern void constraintExprData_freeTerm (/*@only@*/ constraintExprData) ;
 
-constraintExprData constraintExprData_termSetTerm ( /*@returned@*/ /*@partial@*/ constraintExprData p_data, /*@only@*/ constraintTerm p_term);
-
-/*@observer@*/ constraintTerm constraintExprData_termGetTerm (/*@observer@*/ constraintExprData p_data) /*@*/;
+extern constraintExprData constraintExprData_termSetTerm ( /*@returned@*/ /*@partial@*/ constraintExprData p_data, /*@only@*/ constraintTerm p_term);
 
-constraintExprUnaryOpKind constraintExprData_unaryExprGetOp (/*@observer@*//*@reldef@*/constraintExprData p_data) /*@*/;
+extern /*@exposed@*/ constraintTerm 
+constraintExprData_termGetTerm (/*@observer@*/ constraintExprData p_data) /*@*/;
 
-/*@observer@*/ constraintExpr  constraintExprData_unaryExprGetExpr (/*@observer@*/ /*@reldef@*/constraintExprData p_data) /*@*/;
+extern constraintExprUnaryOpKind 
+constraintExprData_unaryExprGetOp (/*@observer@*/ /*@reldef@*/ constraintExprData p_data) /*@*/;
 
+extern /*@observer@*/ constraintExpr 
+constraintExprData_unaryExprGetExpr (/*@observer@*/ /*@reldef@*/constraintExprData p_data) /*@*/;
 
-//  special constraintExprData  constraintExprData_unaryExprSetOp ( /out special@*/ @returned@ constraintExprData p_data, constraintExprUnaryOpKind op) /sets result->unaryOp.unaryOp;
+extern constraintExprData  
+constraintExprData_unaryExprSetOp (/*@partial@*/ /*@returned@*/ constraintExprData p_data, constraintExprUnaryOpKind p_op);
 
+extern constraintExprData  constraintExprData_unaryExprSetExpr (/*@partial@*/ /*@returned@*/ constraintExprData p_data,  /*@only@*/ constraintExpr p_expr);
 
-constraintExprData  constraintExprData_unaryExprSetOp (/*@partial@*/ /*@returned@*/ constraintExprData p_data, constraintExprUnaryOpKind p_op);
+extern constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (/*@partial@*/constraintExprData p_data) /*@*/;
 
-constraintExprData  constraintExprData_unaryExprSetExpr (/*@partial@*/ /*@returned@*/ constraintExprData p_data,  /*@only@*/ constraintExpr p_expr);
+extern /*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr1 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
 
+extern /*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr2 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
 
-constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (/*@partial@*/constraintExprData p_data) /*@*/;
+extern constraintExprData  constraintExprData_binaryExprSetExpr1 (/*@partial@*/ /*@returned@*/ constraintExprData p_data, /*@only@*/ constraintExpr p_expr) ;
 
-/*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr1 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
+extern constraintExprData  constraintExprData_binaryExprSetExpr2  (/*@partial@*/ /*@returned@*/  constraintExprData p_data, /*@only@*/ constraintExpr p_expr);
 
-/*@observer@*/ constraintExpr  constraintExprData_binaryExprGetExpr2 (/*@observer@*/ /*@reldef@*/constraintExprData p_data)/*@*/;
+extern constraintExprData  constraintExprData_binaryExprSetOp (/*@partial@*/ /*@returned@*/ /*@out@*/constraintExprData p_data, constraintExprBinaryOpKind p_op);
 
-constraintExprData  constraintExprData_binaryExprSetExpr1 (/*@partial@*/ /*@returned@*/ constraintExprData p_data, /*@only@*/ constraintExpr p_expr) ;
-
-constraintExprData  constraintExprData_binaryExprSetExpr2  (/*@partial@*/ /*@returned@*/  constraintExprData p_data, /*@only@*/ constraintExpr p_expr);
-
-constraintExprData  constraintExprData_binaryExprSetOp (/*@partial@*/ /*@returned@*/ /*@out@*/constraintExprData p_data, constraintExprBinaryOpKind p_op);
-
-/*@only@*/ constraintExprData constraintExprData_copyBinaryExpr(/*@observer@*/ constraintExprData p_data);
-
-/*@only@*/ constraintExprData constraintExprData_copyUnaryExpr(/*@observer@*/ constraintExprData p_data);
-
-/*@only@*/ constraintExprData constraintExprData_copyTerm (/*@observer@*/ constraintExprData p_data);
+extern /*@only@*/ constraintExprData constraintExprData_copyBinaryExpr(/*@observer@*/ constraintExprData p_data);
+extern /*@only@*/ constraintExprData constraintExprData_copyUnaryExpr(/*@observer@*/ constraintExprData p_data);
+extern /*@only@*/ constraintExprData constraintExprData_copyTerm (/*@observer@*/ constraintExprData p_data);
 
 #else
-
 #error "Multiple Include"
-
 #endif