Fixed all /*@i...@*/ tags (except 1).

[splint.git] / src / constraintList.c

diff --git a/src/constraintList.c b/src/constraintList.c
index ac1a26f767b1d21ecc895b38b9213d9ced753057..ba719e9e992cba8fc59c97fa5b050792ee720945 100644 (file)
--- a/src/constraintList.c
+++ b/src/constraintList.c
@@ -17,8 +17,8 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
 ** For more information: http://www.splint.org
 */
 
@@ -30,9 +30,8 @@
 ** where T has T_equal (or change this) and T_unparse
 */
 
-# include "lclintMacros.nf"
-# include "llbasic.h"
-
+# include "splintMacros.nf"
+# include "basic.h"
 
 /*@iter constraintList_elements_private_only (sef constraintList x, yield only constraint el); @*/
 # define constraintList_elements_private_only(x, m_el) \
@@ -60,7 +59,7 @@
   s->nspace = constraintListBASESIZE;
   s->elements = (constraint *)
     dmalloc (sizeof (*s->elements) * constraintListBASESIZE);
-
+  
   return (s);
 }
 
@@ -125,7 +124,7 @@ static void constraintList_freeShallow (/*@only@*/ constraintList c)
   c = NULL;
 }
 
-/*@only@*/ constraintList constraintList_addList (/*@only@*/ /*@returned@*/ constraintList s, /*@observer@*/ constraintList newList)
+/*@only@*/ constraintList constraintList_addList (/*@only@*/ /*@returned@*/ constraintList s, /*@observer@*/ /*@temp@*/ constraintList newList)
 {
   llassert(constraintList_isDefined(s) );
   llassert(constraintList_isDefined(newList) );
@@ -181,14 +180,14 @@ constraintList constraintList_removeSurpressed (/*@only@*/ constraintList s)
       else if (context_suppressFlagMsg(FLG_BOUNDSWRITE, loc) )
        {
          DPRINTF ((message ("constraintList_removeSurpressed getting rid of surpressed constraint %q", 
-                            constraint_print(elem))));
+                            constraint_unparse(elem))));
          constraint_free(elem);
        }
       
       else if (!constraint_hasMaxSet(elem) && context_suppressFlagMsg(FLG_BOUNDSREAD, loc))
        {
          DPRINTF ((message("constraintList_removeSurpressed getting rid of surpressed constraint %q", 
-                           constraint_print(elem))));
+                           constraint_unparse(elem))));
          constraint_free(elem);
        }
       else
@@ -204,15 +203,9 @@ constraintList constraintList_removeSurpressed (/*@only@*/ constraintList s)
   return ret;
 }
 
-
-extern /*@only@*/ cstring constraintList_unparse ( /*@observer@*/ constraintList s) /*@*/
-{
-  return (constraintList_print(s));
-}
-
 # if 0
 static /*@only@*/ cstring
-constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/
+constraintList_unparseLocation (/*@temp@*/ constraintList s) /*@*/
 {
   int i;
   cstring st = cstring_undefined;
@@ -237,7 +230,7 @@ constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/
       if (constraint_isDefined(current) )
        {
          cstring temp1;
-             temp1 = constraint_printLocation(current);
+             temp1 = constraint_unparseLocation(current);
          type = message ("%q %q\n", type, temp1 );
        }
 
@@ -257,7 +250,7 @@ constraintList_printLocation (/*@temp@*/ constraintList s) /*@*/
 # endif
 
 /*@only@*/ cstring
-constraintList_print (/*@temp@*/ constraintList s) /*@*/
+constraintList_unparse (/*@temp@*/ constraintList s) /*@*/
 {
   int i;
   cstring st = cstring_undefined;
@@ -282,10 +275,15 @@ constraintList_print (/*@temp@*/ constraintList s) /*@*/
       if (constraint_isDefined(current) )
        {
          cstring temp1;
-           if ( context_getFlag (FLG_ORCONSTRAINT) )
-             temp1 = constraint_printOr(current);
-           else
-             temp1 = constraint_print(current);
+
+         if (context_getFlag (FLG_ORCONSTRAINT))
+           {
+             temp1 = constraint_unparseOr (current);
+           }
+         else
+           {
+             temp1 = constraint_unparse (current);
+           }
          type = message ("%q %q\n", type, temp1 );
        }
 
@@ -336,7 +334,7 @@ void constraintList_printError (constraintList s, fileloc loc)
 
 
 cstring
-constraintList_printDetailed (constraintList s)
+constraintList_unparseDetailed (constraintList s)
 {
   int i;
   cstring st = cstring_undefined;
@@ -360,7 +358,7 @@ constraintList_printDetailed (constraintList s)
 
       if (constraint_isDefined(current ) )
        {
-         cstring temp1 = constraint_printDetailed (current);
+         cstring temp1 = constraint_unparseDetailed (current);
          type = message ("%s %s\n", type, temp1 );
          cstring_free(temp1);
        }
@@ -388,8 +386,8 @@ constraintList_logicalOr (/*@observer@*/ constraintList l1, /*@observer@*/ const
   constraint temp;
   constraintList ret;
   DPRINTF ((message ("Logical or on %s and %s",
-                     constraintList_print(l1), 
-                     constraintList_print(l2)) ) );
+                     constraintList_unparse(l1), 
+                     constraintList_unparse(l2)) ) );
   
   ret = constraintList_makeNew();
   constraintList_elements (l1, el)
@@ -434,22 +432,22 @@ constraintList_logicalOr (/*@observer@*/ constraintList l1, /*@observer@*/ const
 void
 constraintList_free (/*@only@*/ constraintList s)
 {
-  int i;
-
-  llassert(constraintList_isDefined(s) );
-
-  
-  for (i = 0; i < s->nelements; i++)
+  if (constraintList_isDefined (s))
     {
-      constraint_free (s->elements[i]); 
+      int i;
+      
+      for (i = 0; i < s->nelements; i++)
+       {
+         constraint_free (s->elements[i]); 
+       }
+      
+      sfree (s->elements);
+      s->elements = NULL;
+      s->nelements = -1;
+      s->nspace = -1;
+      sfree (s);
+      s = NULL;
     }
-
-  sfree (s->elements);
-  s->elements = NULL;
-  s->nelements = -1;
-  s->nspace = -1;
-  sfree (s);
-  s = NULL;
 }
 
 constraintList
@@ -467,7 +465,7 @@ constraintList_copy (/*@observer@*/ /*@temp@*/ constraintList s)
 
 constraintList constraintList_preserveOrig (constraintList c)
 {
-  DPRINTF((message("constraintList_preserveOrig preserving the originial constraints for %s ", constraintList_print (c) ) ));
+  DPRINTF((message("constraintList_preserveOrig preserving the originial constraints for %s ", constraintList_unparse (c) ) ));
 
   constraintList_elements_private (c, el)
   {
@@ -479,7 +477,7 @@ constraintList constraintList_preserveOrig (constraintList c)
 
 constraintList constraintList_preserveCallInfo (/*@returned@*/ constraintList c,/*@observer@*/ /*@dependent@*/ /*@observer@*/  exprNode fcn)
 {
-  DPRINTF((message("constraintList_preserveCallInfo %s ", constraintList_print (c) ) ));
+  DPRINTF((message("constraintList_preserveCallInfo %s ", constraintList_unparse (c) ) ));
 
   constraintList_elements_private (c, el)
   {
@@ -504,7 +502,7 @@ constraintList constraintList_addGeneratingExpr (constraintList c,/*@dependent@*
   
   constraintList_elements_private (c, el)
   {
-    DPRINTF ((message ("setting generatingExpr for %s to %s", constraint_print(el), exprNode_unparse(e) )  ));
+    DPRINTF ((message ("setting generatingExpr for %s to %s", constraint_unparse(el), exprNode_unparse(e) )  ));
     el = constraint_addGeneratingExpr (el, e);
   }
   end_constraintList_elements_private;
@@ -524,6 +522,25 @@ constraintList constraintList_addGeneratingExpr (constraintList c,/*@dependent@*
   constraintList_free(postconditions);
   return ret;
 }
+/*
+Commenting out because function is not yet stable
+  
+/ *@only@* / constraintList constraintList_doSRefFixStructConstraint(constraintList invars, sRef s, ctype ct )
+{
+  constraintList ret;
+  ret = constraintList_makeNew();
+  
+  constraintList_elements (invars, el)
+    {
+      ret = constraintList_add(ret, constraint_doSRefFixInvarConstraint (el, s, ct) );
+    }
+  end_constraintList_elements;
+
+  / *  constraintList_free (invars);* /
+
+  return ret;
+}
+*/
 
 /*@only@*/ constraintList constraintList_doSRefFixConstraintParam (constraintList preconditions, /*@temp@*/ /*@observer@*/ exprNodeList arglist)
 {
@@ -589,6 +606,12 @@ constraintList constraintList_togglePost (/*@returned@*/ constraintList c)
 
       c =  reader_getWord(&s);
       
+      if (! mstring_isDefined(c) )
+       {
+         llfatalbug(message("Library file is corrupted") );
+       }
+  
+
       if (strcmp (c, "C") != 0)
        {
          llfatalbug(message("Error reading library.  File may be corrupted"));
@@ -618,6 +641,11 @@ void constraintList_dump (/*@observer@*/ constraintList c,  FILE *f)
 
 constraintList constraintList_sort (/*@returned@*/ constraintList ret)
 {
+  if (constraintList_isUndefined(ret) )
+    {
+      llassert(FALSE);
+      return ret;
+    }
   qsort (ret->elements, (size_t) ret->nelements,
         (sizeof (*ret->elements)), 
         (int (*)(const void *, const void *)) constraint_compare);