X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/0ec8d634f3a2670d2bac41f335ea17ae1ffc0246..2a6e9c30f59a18a1f6e678745a79ae5bda5b6a99:/src/constraintExpr.c

diff --git a/src/constraintExpr.c b/src/constraintExpr.c
index df1abb5..7093b6e 100644
--- a/src/constraintExpr.c
+++ b/src/constraintExpr.c
@@ -1052,17 +1052,17 @@ bool constraintExpr_same (constraintExpr expr1, constraintExpr expr2)
   BADEXIT;
 }
 
-bool constraintExpr_search (/*@observer@*/ constraintExpr c, /*@observer@*/ constraintExpr old)
+bool 
+constraintExpr_search (/*@observer@*/ constraintExpr c, 
+		       /*@observer@*/ constraintExpr old)
 {
   bool ret = FALSE;
   constraintExprKind kind;
   constraintExpr temp;
   
-  if ( constraintExpr_similar (c, old) )
+  if (constraintExpr_similar (c, old))
     {
-      DPRINTF((message ("Found  %q",
-			constraintExpr_unparse(old)
-			)));
+      DPRINTF (("Found  %q", constraintExpr_unparse (old)));
       return TRUE;
     }
 
@@ -1543,11 +1543,11 @@ cstring constraintExpr_unparse (/*@temp@*/ /*@observer@*/ constraintExpr ex) /*@
 
             if (context_getFlag (FLG_PARENCONSTRAINT) )
 	      {
-		st = message ("(%q) ", constraintTerm_print (constraintExprData_termGetTerm (ex->data)));
+		st = message ("(%q) ", constraintTerm_unparse (constraintExprData_termGetTerm (ex->data)));
 	      }
 	    else
 	      {
-		st = message ("%q", constraintTerm_print (constraintExprData_termGetTerm (ex->data)));
+		st = message ("%q", constraintTerm_unparse (constraintExprData_termGetTerm (ex->data)));
 	      }
       break;
     case unaryExpr:
@@ -1888,32 +1888,29 @@ doFixResultTerm (/*@only@*/ constraintExpr e, /*@exposed@*/ exprNode fcnCall)
 {
   constraintTerm t;
   sRef s;
-
-  
   constraintExprData data;
   constraintExprKind kind;
-  
   constraintExpr ret;
-
-  llassert(constraintExpr_isDefined (e) );
+  
+  llassert (constraintExpr_isDefined (e) );
   
   data = e->data;
   kind = e->kind;
-
-  llassert(kind == term);
-
+  
+  llassert (kind == term);
+  
   t = constraintExprData_termGetTerm (data);
-  llassert (constraintTerm_isDefined(t) );
-
+  llassert (constraintTerm_isDefined (t));
+  
   ret = e;
-  switch (constraintTerm_getKind(t) )
+
+  switch (constraintTerm_getKind (t))
     {
-    case EXPRNODE:
-      break;
-    case INTLITERAL:
+    case CTT_EXPR:
+    case CTT_INTLITERAL:
       break;
       
-    case SREF:
+    case CTT_SREF:
       s = constraintTerm_getSRef(t);
       if (sRef_isResult (s))
 	{
@@ -1933,7 +1930,11 @@ doFixResultTerm (/*@only@*/ constraintExpr e, /*@exposed@*/ exprNode fcnCall)
   return ret;
   
 }
-/*
+
+#if 0
+
+/*to be used for structure checking */
+
 / *@only@* / static constraintExpr
 doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e,
  sRef s, ctype ct)
@@ -1957,21 +1958,21 @@ doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e,
 
   switch (constraintTerm_getKind(t))
     {
-    case EXPRNODE:
-      DPRINTF((message ("%q @ %q ", constraintTerm_print(t),
+    case CTT_EXPR:
+      DPRINTF((message ("%q @ %q ", constraintTerm_unparse(t),
 			fileloc_unparse (constraintTerm_getFileloc(t) ) ) ));
       break;
-    case INTLITERAL:
-      DPRINTF((message (" %q ", constraintTerm_print (t)) ));
+    case CTT_INTLITERAL:
+      DPRINTF((message (" %q ", constraintTerm_unparse (t)) ));
       break;
       
-    case SREF:
+    case CTT_SREF:
       / * evans 2001-07-24: constants should use the original term * /
       if (!constraintTerm_canGetValue (t))
 	{
 	  sRef snew;
 	  DPRINTF ((message("Doing sRef_fixInvarConstraint for %q ", 
-			     constraintTerm_print (t) ) ));
+			     constraintTerm_unparse (t) ) ));
 
 	  snew = fixSref (ct, s, constraintTerm_getSRef(t));
 
@@ -1992,7 +1993,7 @@ doSRefFixInvarConstraintTerm (/ *@only@* / constraintExpr e,
   return ret;
   
 }
-*/
+#endif
  
 /*drl moved from constriantTerm.c 5/20/001*/
 /*@only@*/ static constraintExpr 
@@ -2026,20 +2027,19 @@ doSRefFixConstraintParamTerm (/*@only@*/ constraintExpr e, /*@observer@*/ /*@tem
 
   switch (constraintTerm_getKind(t))
     {
-    case EXPRNODE:
-      DPRINTF((message ("%q @ %q ", constraintTerm_print(t),
+    case CTT_EXPR:
+      DPRINTF((message ("%q @ %q ", constraintTerm_unparse(t),
 			fileloc_unparse (constraintTerm_getFileloc(t) ) ) ));
       break;
-    case INTLITERAL:
-      DPRINTF((message (" %q ", constraintTerm_print (t)) ));
+    case CTT_INTLITERAL:
+      DPRINTF((message (" %q ", constraintTerm_unparse (t)) ));
       break;
-      
-    case SREF:
+    case CTT_SREF:
       /* evans 2001-07-24: constants should use the original term */
       if (!constraintTerm_canGetValue (t))
 	{
 	  DPRINTF ((message("Doing sRef_fixConstraintParam for %q ", 
-			     constraintTerm_print (t) ) ));
+			     constraintTerm_unparse (t) ) ));
 	  ret = sRef_fixConstraintParam (constraintTerm_getSRef(t), arglist);
 	  
 	  constraintExpr_free (e);