Committing after merging Evan's changes.

[splint.git] / src / abstract.c

diff --git a/src/abstract.c b/src/abstract.c
index 301a81f67a33cce9472170ba69da218746ec4093..3e95eaea3c3e6ac6d753026b142c5f0db2e78e61 100644 (file)
--- a/src/abstract.c
+++ b/src/abstract.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
@@ -186,7 +186,7 @@ abstract_init ()
   ti->modifiable = FALSE;
   ti->abstract = FALSE;
   ti->export = FALSE;          /* this is implicit, not exported */
-  ti->basedOn = sort_float;
+  ti->basedOn = g_sortFloat;
   symtable_enterType (g_symtab, ti);
 }
 
@@ -236,7 +236,7 @@ void LCLBuiltins (void)
 
   ti->modifiable = FALSE;
   ti->abstract = TRUE;
-  ti->basedOn = sort_bool;
+  ti->basedOn = g_sortBool;
   ti->export = FALSE; /* this wasn't set (detected by Splint) */
   symtable_enterType (g_symtab, ti);
   
@@ -244,7 +244,7 @@ void LCLBuiltins (void)
   vi->id = ltoken_createType (simpleId, SID_VAR, lsymbol_fromChars ("FALSE"));
 
   vi->kind = VRK_CONST;
-  vi->sort = sort_bool;
+  vi->sort = g_sortBool;
   vi->export = TRUE;
 
   (void) symtable_enterVar (g_symtab, vi);
@@ -1365,7 +1365,7 @@ nameNode_unparse (/*@null@*/ nameNode n)
 makesigNode (ltoken t, /*@only@*/ ltokenList domain, ltoken range)
 {
   sigNode s = (sigNode) dmalloc (sizeof (*s));
-  unsigned int key;
+  unsigned long int key;
 
   /*
   ** Assign a hash key here to speed up lookup of operators.
@@ -1383,7 +1383,7 @@ makesigNode (ltoken t, /*@only@*/ ltokenList domain, ltoken range)
     } end_ltokenList_elements;
   
   s->key = key;
-    return (s);
+  return (s);
 }
 
 cstring sigNode_unparse (/*@null@*/ sigNode n)
@@ -1413,10 +1413,9 @@ sigNode_unparseText (/*@null@*/ sigNode n)
   return cstring_undefined;
 }
 
-static unsigned int
-  opFormNode2key (opFormNode op, opFormKind k)
+static unsigned long opFormNode2key (opFormNode op, opFormKind k)
 {
-  unsigned int key;
+  unsigned long int key;
 
   switch (k)
     {
@@ -1474,7 +1473,7 @@ makeOpFormNode (ltoken t, opFormKind k, opFormUnion u,
                ltoken close)
 {
   opFormNode n = (opFormNode) dmalloc (sizeof (*n));
-  unsigned int key = 0;
+  unsigned long int key = 0;
 
   /*
   ** Assign a hash key here to speed up lookup of operators.
@@ -1483,7 +1482,6 @@ makeOpFormNode (ltoken t, opFormKind k, opFormUnion u,
   n->tok = t;
   n->close = close;
   n->kind = k;
-
   
   switch (k)
     {
@@ -1536,7 +1534,7 @@ makeOpFormNode (ltoken t, opFormKind k, opFormUnion u,
       }
     }
   n->key = key;
-    return (n);
+  return (n);
 }
 
 static cstring printMiddle (int j)
@@ -3703,7 +3701,7 @@ makeQuantifiedTermNode (quantifierNodeList qn, ltoken open,
   termNodeList_free (t->args);
   t->args = termNodeList_new ();
 
-  sort = sort_bool;
+  sort = g_sortBool;
   n->sort = sort;
   (void) sortSet_insert (n->possibleSorts, sort);
 
@@ -4225,7 +4223,7 @@ makeLiteralTermNode (ltoken tok, sort s)
      needed anyway.  */
   /*  symtable_enterOp (g_symtab, nn, sign); */
 
-  if (s == sort_int)
+  if (s == g_sortInt)
     {
       sigNode osign;
       lslOp opn = (lslOp) dmalloc (sizeof (*opn));
@@ -4233,7 +4231,7 @@ makeLiteralTermNode (ltoken tok, sort s)
       /* if it is a C int, we should overload it as double too because
         C allows you to say "x > 2". */
       
-      (void) sortSet_insert (n->possibleSorts, sort_double);
+      (void) sortSet_insert (n->possibleSorts, g_sortDouble);
       
       ltoken_setText (range, lsymbol_fromChars ("double"));
       osign = makesigNode (ltoken_undefined, ltokenList_new (), range);
@@ -4263,7 +4261,7 @@ makeUnchangedTermNode1 (ltoken op, /*@unused@*/ ltoken all)
   t->error_reported = FALSE;
   t->wrapped = 0;
   t->kind = TRM_UNCHANGEDALL;
-  t->sort = sort_bool;
+  t->sort = g_sortBool;
   t->literal = op;
   t->given = sort_makeNoSort ();
   t->name = NULL; /*< missing this >*/
@@ -4288,7 +4286,7 @@ makeUnchangedTermNode2 (ltoken op, storeRefNodeList x)
   t->error_reported = FALSE;
   t->wrapped = 0;
   t->kind = TRM_UNCHANGEDOTHERS;
-  t->sort = sort_bool;
+  t->sort = g_sortBool;
   t->literal = op;
   t->unchanged = x;
   t->given = sort_makeNoSort ();
@@ -4340,7 +4338,7 @@ makeUnchangedTermNode2 (ltoken op, storeRefNodeList x)
   t->error_reported = FALSE;
   t->wrapped = 0;
   t->kind = TRM_SIZEOF;
-  t->sort = sort_int;
+  t->sort = g_sortInt;
   t->literal = op;
   t->sizeofField = type;
   t->given = sort_makeNoSort ();
@@ -5357,7 +5355,7 @@ enteringFcnScope (lclTypeSpecNode t, declaratorNode d, globalList g)
   fctInfo fi    = (fctInfo) dmalloc (sizeof (*fi));
   signNode sign = (signNode) dmalloc (sizeof (*sign));
   sortList domain = sortList_new ();
-  unsigned int key;
+  unsigned long int key;
 
   paramPairs = extractParams (d->type);
   returnSort = extractReturnSort (t, d);