*** empty log message ***

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

diff --git a/src/Headers/constraint.h b/src/Headers/constraint.h
index 18785213012c313cc5b83435a2c8e8239d8013cc..12a52a6a55d7e9a4cdb66f797bba55bacccdf852 100644 (file)
--- a/src/Headers/constraint.h
+++ b/src/Headers/constraint.h
@@ -1,10 +1,20 @@
 typedef union constraintTermValue_
 {
+  constraintExpr constrExpr;
   exprNode expr;
   sRef     sref;
   int      intlit;
 } constraintTermValue;
 
+
+typedef enum
+{
+ EXPRNODE, SREF,
+ CONSTRAINTEXPR,
+ INTLITERAL
+} constraintTermType;
+
+
 typedef enum
 {
   LT, LTE, GT, GTE, EQ, NONNEGATIVE, POSITIVE
@@ -13,10 +23,10 @@ arithType;
 
 typedef enum
 {
- BUFFSIZE, STRINGLEN, VALUE, CALLSAFE,
+  //BUFFSIZE, STRINGLEN,
+ VALUE, CALLSAFE,
  MAXSET, MINSET, MAXREAD, MINREAD,
  NULLTERMINATED,
- INCOP,
  UNDEFINED
 }
 constraintType;
@@ -29,13 +39,6 @@ typedef enum
 constraintExprOp;
 
 
-typedef enum
-{
-EXPRNODE, SREF,
-INTLITERAL
-} constraintTermType;
-
-
 struct _constraintTerm {
   constraintType constrType;
   fileloc loc;
@@ -53,19 +56,18 @@ struct constraintExpr_ {
 };
 # define constraintExpr_undefined ((constraintExpr)NULL)
 
-typedef struct constraintExpr_ * constraintExpr;
-abst_typedef struct constr_ * constr;
+
+//abst_typedef struct constr_ * constr;
 
 
 struct _constraint {
+  constraint     orig;
   constraintExpr lexpr;
   arithType       ar;
   constraintExpr  expr;
   bool post;
 } ;
 
-#define max_constraints 100
-
 //constraint constraint_create (exprNode e1, exprNode e2,  arithType restriction, constraintType kind);
 
 constraint constraint_createReadSafe (exprNode p_e1, exprNode p_e2);