Prewinter break editing commit.

[splint.git] / src / constraint.c

diff --git a/src/constraint.c b/src/constraint.c
index 826d9b4eb0a1482fcf4c848536b4c2e963d6485c..877613a47d2aee7e626211feb8938dc361c072f3 100644 (file)
--- a/src/constraint.c
+++ b/src/constraint.c
@@ -2,6 +2,8 @@
 ** constraintList.c
 */
 
+//#define DEBUGPRINT 1
+
 # include <ctype.h> /* for isdigit */
 # include "lclintMacros.nf"
 # include "basic.h"
@@ -27,8 +29,8 @@ constraint makeConstraintParse (sRef x, lltok relOp, exprNode cconstant)
   int c;
   constraint ret;
   ret = constraint_makeNew();
-  llassert (x);
-  if (!x)
+  llassert (sRef_isValid(x) );
+  if (!sRef_isValid(x))
     return ret;
  
     
@@ -391,11 +393,28 @@ cstring arithType_print (arithType ar)
   return st;
 }
 
+void constraint_printError (constraint c, fileloc loc)
+{
+  cstring string;
+
+  string = constraint_printDetailed (c);
+  
+  if (c->post)
+    {
+       voptgenerror (FLG_FUNCTIONPOST, string, loc);
+    }
+  else
+    {
+      voptgenerror (FLG_FUNCTIONCONSTRAINT, string, loc);
+    }
+      
+}
 
 cstring  constraint_printDetailed (constraint c)
 {
   cstring st = cstring_undefined;
 
+
   if (!c->post)
     {
     if (c->orig)  
@@ -414,7 +433,7 @@ cstring  constraint_printDetailed (constraint c)
   return st;
 }
 
-cstring  constraint_print (constraint c)
+cstring  constraint_print (constraint c) /*@*/
 {
   cstring st = cstring_undefined;
   cstring type = cstring_undefined;