Changes to fix malloc size problem.

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

diff --git a/src/Headers/constraintExpr.h b/src/Headers/constraintExpr.h
index 5035a54f0341c957f50f4bbd05defb64556100b3..a3d262f105658fcfc69d9adee7a0f5304aee25c6 100644 (file)
--- a/src/Headers/constraintExpr.h
+++ b/src/Headers/constraintExpr.h
@@ -7,11 +7,12 @@ typedef enum
   binaryexpr,
   unaryExpr,
   term
-}
-constraintExprKind;
+} constraintExprKind;
 
 struct s_constraintExpr {
   constraintExprKind kind;
+  bool ct; /*changed type */
+  ctype origType;
   constraintExprData data;
 };
 
@@ -50,7 +51,7 @@ int constraintExpr_compare (constraintExpr p_expr1, constraintExpr p_expr2) /*@*
 
 /* constraintExpr constraintExpr_makeValueInt (int i); */
 
-/*@only@*/ constraintExpr constraintExpr_makeIntLiteral (long p_i);
+/*@only@*/ /*@notnull@*/constraintExpr constraintExpr_makeIntLiteral (long p_i);
 
 /*@only@*/ constraintExpr constraintExpr_makeValueExpr (/*@exposed@*/ exprNode p_expr);
 
@@ -68,7 +69,7 @@ int constraintExpr_compare (constraintExpr p_expr1, constraintExpr p_expr2) /*@*
 
 bool constraintExpr_search (/*@observer@*/ /*@temp@*/ constraintExpr p_c, /*@observer@*/ /*@temp@*/ constraintExpr p_old);
 
-/*@only@*/ fileloc constraintExpr_getFileloc (constraintExpr p_expr);
+/*@only@*/ fileloc constraintExpr_loc (constraintExpr p_expr);
 
 
 /*@only@*/ constraintExpr constraintExpr_makeSRefMaxset ( /*@temp@*/ /*@observer@*/ sRef p_s);
@@ -122,6 +123,15 @@ bool constraintExpr_isTerm (/*@observer@*/ /*@temp@*/ constraintExpr p_c);
 int constraintExpr_getDepth (/*@observer@*/ /*@temp@*/ constraintExpr p_ex);
 
 
+/*drl 1/6/2001: I didn't think these functions were solid enough to include in the   stable  release of splint.*/
+/* drl added 12/30/001*/
+/* extern / *@only@* / constraintExpr constraintExpr_doSRefFixInvarConstraint (/ *@only@* / constraintExpr p_expr, sRef p_s, ctype p_ct); */
+
+
+
+/*drl added 12/19 */
+bool  constraintExpr_isConstantOnly ( constraintExpr p_e );
+
 #else
 # error "Multiple include"
 #endif