Added support for or constraints.

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

diff --git a/src/Headers/constraintExpr.h b/src/Headers/constraintExpr.h
index 56ceb4e54e6bf6ba16d9bbda8f07a91974569633..631d0426f64dc87a86476d790a07f42ded598212 100644 (file)
--- a/src/Headers/constraintExpr.h
+++ b/src/Headers/constraintExpr.h
@@ -11,6 +11,7 @@ typedef union constraintTermValue_
 
 typedef enum
 {
+  ERRORBADCONSTRAINTTERMTYPE,
  EXPRNODE, SREF,
  INTLITERAL
 } constraintTermType;
@@ -42,7 +43,7 @@ typedef enum
 {
   binaryexpr,
   unaryExpr,
-  term,
+  term
 }
 constraintExprKind;
 
@@ -78,14 +79,14 @@ struct constraintExpr_ {
 
 //constraintTerm constraintTerm_copy (constraintTerm term);
 
-int constraintExpr_getValue (constraintExpr expr);
+int constraintExpr_getValue (constraintExpr expr) /*@*/;
 
 constraintExpr constraintExpr_setFileloc (constraintExpr expr, fileloc loc);
 
 constraintExpr constraintExpr_copy (constraintExpr expr);
 
-cstring constraintExpr_unparse (constraintExpr ex);
-extern cstring constraintExpr_print (constraintExpr expr);
+cstring constraintExpr_unparse (constraintExpr ex) /*@*/;
+extern cstring constraintExpr_print (constraintExpr expr) /*@*/;
 
 
 bool constraintExpr_similar (constraintExpr expr1, constraintExpr expr2);
@@ -138,7 +139,7 @@ constraintExprData  constraintExprData_unaryExprSetOp (constraintExprData data,
 constraintExprData  constraintExprData_unaryExprSetExpr (constraintExprData data, constraintExpr expr);
 
 
-constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (constraintExprData data);
+constraintExprBinaryOpKind  constraintExprData_binaryExprGetOp (constraintExprData data) /*@*/;
 
 constraintExpr  constraintExprData_binaryExprGetExpr1 (constraintExprData data)/*@*/;
 
@@ -170,4 +171,10 @@ constraintExpr constraintExpr_parseMakeBinaryOp (constraintExpr expr1, lltok op,
 
 bool constraintExpr_hasMaxSet (constraintExpr expr);
 
+constraintExpr constraintExpr_propagateConstants (constraintExpr expr,
+                                               /*@out@*/ bool * propagate,
+                                                 /*@out@*/ int *literal);
+
+constraintExpr constraintExpr_makeSRefMaxRead(sRef s);
+
 #endif