Merged this branch with the one in the splint.sf.net repository.

[splint.git] / src / constraint.c

diff --git a/src/constraint.c b/src/constraint.c
index cb87d1025e6e0550d5eb06a81a7f2c6e60df90bf..7c3338c7c8e49aefa516b30c7e30a7c82b44867e 100644 (file)
--- a/src/constraint.c
+++ b/src/constraint.c
@@ -42,7 +42,7 @@
 /*@access exprNode@*/ /* !!! NO! Don't do this recklessly! */
 /*@-nullderef@*/ /* !!! DRL needs to fix this code! */
 /*@-nullstate@*/ /* !!! DRL needs to fix this code! */
-/*@-temptrans@*/ /* !!! DRL needs to fix this code! */
+
 
 static /*@only@*/ cstring  constraint_printDetailedPostCondition (/*@observer@*/ /*@temp@*/ constraint p_c);
 
@@ -113,7 +113,10 @@ bool constraint_same (constraint c1, constraint c2)
   return TRUE;
 }
 
-constraint makeConstraintParse3 (constraintExpr l, lltok relOp, constraintExpr r)     
+/* 14 May 2002
+   Changed the name old name was  makeConstraintParse3
+*/
+constraint constraint_makeConstraintLltok (constraintExpr l, lltok relOp, constraintExpr r)     
 {
   constraint ret;
   ret = constraint_makeNew ();
@@ -717,6 +720,8 @@ void constraint_printError (constraint c, fileloc loc)
   fileloc errorLoc, temp;
 
 
+  c = constraint_simplify(c);
+  
   /*drl 11/26/2001 avoid printing tautological constraints */
   if (constraint_isAlwaysTrue (c))
     {