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

[splint.git] / src / checking.c

diff --git a/src/checking.c b/src/checking.c
index a75595f3094474599a7c227201d45b3b84048166..c574aeef7a6aa27ec94a416b495d957ead3121dd 100644 (file)
--- a/src/checking.c
+++ b/src/checking.c
@@ -1,6 +1,6 @@
 /*
 ** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2002 University of Virginia,
+** Copyright (C) 1994-2003 University of Virginia,
 **         Massachusetts Institute of Technology
 **
 ** This program is free software; you can redistribute it and/or modify it
@@ -17,8 +17,8 @@
 ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ** MA 02111-1307, USA.
 **
-** For information on splint: splint@cs.virginia.edu
-** To report a bug: splint-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
 */
 /* 
@@ -32,7 +32,7 @@
 */
 
 # include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
 # include "llgrammar.h"
 # include "checking.h"
 # include "lclscan.h"
@@ -41,7 +41,7 @@
 
 static /*@only@*/ cstring printBadArgs (sortSetList p_args);
 static /*@only@*/ sortSet 
-  standardOperators (/*@null@*/ nameNode p_n, sortSetList p_argSorts, sort p_qual);
+  standardOperators (/*@null@*/ nameNode p_n, sortSetList p_argSorts, sort p_q);
 static bool isStandardOperator (/*@null@*/ nameNode p_n);
 static void assignSorts (termNode p_t, sort p_s);
 
@@ -398,7 +398,7 @@ checkLclPredicate (ltoken t, lclPredicateNode n)
     {
      /* check that the sort of n is boolean */
       theSort = n->predicate->sort;
-      if (!sort_compatible (theSort, sort_capBool))
+      if (!sort_compatible (theSort, g_sortCapBool))
        {
          if (sort_isNoSort (theSort))
            {
@@ -543,7 +543,7 @@ static bool isStandardOperator (/*@null@*/ nameNode n)
 }
 
 static /*@only@*/ sortSet
-standardOperators (/*@null@*/ nameNode n, sortSetList argSorts, /*@unused@*/ sort qual)
+standardOperators (/*@null@*/ nameNode n, sortSetList argSorts, /*@unused@*/ sort q)
 {
   sortSet argSet;
   sortSet ret = sortSet_new ();
@@ -582,14 +582,14 @@ standardOperators (/*@null@*/ nameNode n, sortSetList argSorts, /*@unused@*/ sor
                      {
                        if (sn->kind == SRT_OBJ ||
                            sn->kind == SRT_ARRAY)
-                       (void) sortSet_insert (ret, sort_bool);   
+                       (void) sortSet_insert (ret, g_sortBool);          
                      }
                    
                    if (cstring_equalLit (text, "maxIndex") || 
                        cstring_equalLit (text, "minIndex"))
                      {
                        if (sn->kind == SRT_ARRAY || sn->kind == SRT_PTR)
-                         (void) sortSet_insert (ret, sort_int);          
+                         (void) sortSet_insert (ret, g_sortInt);         
                        
                        /*                if (lsymbol_fromChars ("maxIndex") */
                      }
@@ -601,14 +601,14 @@ standardOperators (/*@null@*/ nameNode n, sortSetList argSorts, /*@unused@*/ sor
                  if (sn->kind == SRT_OBJ ||
                      sn->kind == SRT_ARRAY)
                    {
-                     (void) sortSet_insert (ret, sort_bool);     
+                     (void) sortSet_insert (ret, g_sortBool);    
                    }
                  break;
                case LLT_SIZEOF:
                  if (sn->kind == SRT_OBJ ||
                      sn->kind == SRT_ARRAY ||
                      sn->kind == SRT_VECTOR)
-                 (void) sortSet_insert (ret, sort_int);
+                 (void) sortSet_insert (ret, g_sortInt);
                  break;
                default:
                  break;
@@ -634,7 +634,7 @@ standardOperators (/*@null@*/ nameNode n, sortSetList argSorts, /*@unused@*/ sor
            {
              argSet = sortSetList_head (argSorts);
              
-             if (sortSet_member (argSet, sort_bool))
+             if (sortSet_member (argSet, g_sortBool))
                {
                  sortSetList_reset (argSorts);
                  sortSetList_advance (argSorts);
@@ -778,7 +778,7 @@ standardOperators (/*@null@*/ nameNode n, sortSetList argSorts, /*@unused@*/ sor
                              {
                                if (sort_equal (cl, cl2))
                                  {
-                                   (void) sortSet_insert (ret, sort_bool);
+                                   (void) sortSet_insert (ret, g_sortBool);
                                  }
                              } end_sortSet_elements;
                          } end_sortSet_elements;