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

[splint.git] / src / symtable.c

diff --git a/src/symtable.c b/src/symtable.c
index 636183f166a123ded105ff0f813348469b172197..b00dbb8d9e99cd5b89ab92e20aee0bc5c66ace12 100644 (file)
--- a/src/symtable.c
+++ b/src/symtable.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
@@ -41,7 +41,7 @@
 */
 
 # include "splintMacros.nf"
-# include "llbasic.h"
+# include "basic.h"
 # include "gram.h"
 # include "lclscan.h"
 # include "lclsyntable.h"
@@ -1043,7 +1043,7 @@ parseLine (char *line, inputStream srce, mapping map)
          llassert (lineptr != NULL);
          lineptr = strchr (lineptr + 1, ' ');  /* go past namestr */
          llassert (lineptr != NULL);
-         col = 5 + lineptr - line;     /* 5 for initial "%LCL "*/
+         col = 5 + ((int) (lineptr - line));   /* 5 for initial "%LCL "*/
 
          lclbug (message ("%q: Imported files contains unknown base sort",
                           fileloc_unparseRawCol (importfile, inputStream_thisLineNumber (srce), col)));
@@ -1078,10 +1078,11 @@ parseLine (char *line, inputStream srce, mapping map)
          if (!usymtab_existsGlobEither (cnamestr))
            {
              (void) usymtab_addEntry 
-               (uentry_makeDatatype (cnamestr, ctype_unknown,
-                                     ti->abstract ? ynm_fromBool (ti->modifiable) : MAYBE,
-                                     ti->abstract ? YES : NO,
-                                     fileloc_copy (imploc)));
+               (uentry_makeDatatype
+                (cnamestr, ctype_unknown,
+                 ti->abstract ? ynm_fromBool (ti->modifiable) : MAYBE,
+                 ti->abstract ? qual_createAbstract () : qual_createConcrete (),
+                 fileloc_copy (imploc)));
            }
        }
 
@@ -1107,7 +1108,7 @@ parseLine (char *line, inputStream srce, mapping map)
       llassert (lineptr != NULL);
       lineptr = strchr (lineptr + 1, ' ');     /* go past namestr */
       llassert (lineptr != NULL);
-      col = 5 + lineptr - line;        /* 5 for initial "%LCL "*/
+      col = 5 + ((int) (lineptr - line));      /* 5 for initial "%LCL "*/
 
       if (sort_isNoSort (bsort))
        {
@@ -1158,7 +1159,7 @@ parseLine (char *line, inputStream srce, mapping map)
       lineptr = strchr (lineptr + 1, ' ');     /* go past namestr */
       llassert (lineptr != NULL);
       
-      col = 5 + lineptr - line;        /* 5 for initial "%LCL "*/
+      col = 5 + ((int) (lineptr - line));      /* 5 for initial "%LCL "*/
 
       if (sort_isNoSort (bsort))
        {
@@ -1340,7 +1341,7 @@ parseLine (char *line, inputStream srce, mapping map)
       lineptr = strchr (lineptr + 1, ' ');     /* go past namestr */
       llassert (lineptr != NULL);
 
-      col = 5 + lineptr - line;        /* 5 for initial "%LCL "*/
+      col = 5 + ((int) (lineptr - line));      /* 5 for initial "%LCL "*/
       if (sort_isNoSort (bsort))
        {
          lclplainerror (message ("%q: unknown base sort\n",
@@ -2093,7 +2094,7 @@ domainMatches (ltokenList domain, sortSetList argSorts)
 
 /*@only@*/ lslOpSet
   symtable_opsWithLegalDomain (symtable tab, /*@temp@*/ /*@null@*/ nameNode n,
-                              sortSetList argSorts, sort qual)
+                              sortSetList argSorts, sort q)
 {
  /* handles nil qual */
   lslOpSet ops = lslOpSet_new ();
@@ -2114,7 +2115,7 @@ domainMatches (ltokenList domain, sortSetList argSorts)
            {
              rangeSort = sigNode_rangeSort (sig);
              
-             if ((qual == 0) || (sort_equal (rangeSort, qual)))
+             if ((q == NULL) || (sort_equal (rangeSort, q)))
                {
                  if (domainMatches (sig->domain, argSorts))
                    {