Changes to fix malloc size problem.

[splint.git] / src / Headers / exprNode.h

diff --git a/src/Headers/exprNode.h b/src/Headers/exprNode.h
index 93ed2c2fd19856657359f3e8d7917674e4f8029c..eec7b7763f378d3459f81f53b4ff36e9a0cb6853 100644 (file)
--- a/src/Headers/exprNode.h
+++ b/src/Headers/exprNode.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2001.
+** Copyright (C) University of Virginia, Massachusetts Institue of Technology 1994-2003.
 ** See ../LICENSE for license information.
 **
 */
@@ -119,7 +119,7 @@ typedef /*@null@*/ union
 {
   cstring literal;
   cstring id;
-  lltok *tok;
+  lltok tok;
   qtype qt;    /* sizeof(type) */
   /* use for any 2-operator (comma, arrayFetch, case, stmt) */
   exprPair pair; 
@@ -160,7 +160,7 @@ struct s_exprNode
   fileloc loc;
   /*@relnull@*/ exprData edata;
   cstring etext;
-  /*@notnull@*/   constraintList requiresConstraints;
+  /*@notnull@*/ constraintList requiresConstraints;
   /*@notnull@*/ constraintList ensuresConstraints;
   
   /*
@@ -307,7 +307,7 @@ extern exprNode exprNode_statement (/*@only@*/ exprNode p_e, /*@only@*/ lltok p_
 extern exprNode exprNode_makeBlock (/*@only@*/ exprNode p_e);
 extern exprNode exprNode_compoundStatementExpression (/*@only@*/ lltok p_tlparen, /*@only@*/ exprNode p_e) ;
 
-extern void exprNode_checkIfPred (exprNode p_pred) /*@modifies g_msgstream@*/ ;
+extern void exprNode_checkIfPred (exprNode p_pred) /*@modifies g_warningstream@*/ ;
 
 extern exprNode exprNode_if (/*@only@*/ exprNode p_pred, /*@only@*/ exprNode p_tclause);
 extern exprNode 
@@ -325,8 +325,8 @@ extern /*@dependent@*/ /*@observer@*/ cstring
 exprNode_unparse (/*@temp@*/ exprNode p_e) /*@*/ ; 
 
 extern /*@falsewhennull@*/ bool exprNode_isBlock (exprNode p_e) /*@*/ ;
-extern /*@falsewhennull@*/ bool exprNode_isCharLit (exprNode p_e) /*@*/ ;
-extern /*@falsewhennull@*/ bool exprNode_isNumLit (exprNode p_e) /*@*/ ;
+extern /*@falsewhennull@*/ bool exprNode_isCharLiteral (exprNode p_e) /*@*/ ;
+extern /*@falsewhennull@*/ bool exprNode_isNumLiteral (exprNode p_e) /*@*/ ;
 
 extern exprNode 
   exprNode_makeInitialization (/*@only@*/ idDecl p_t, /*@only@*/ exprNode p_e);
@@ -348,17 +348,15 @@ extern            exprNode exprNode_iterExpr (/*@returned@*/ exprNode p_e);
 extern exprNode exprNode_iterNewId (/*@only@*/ cstring p_s);
 extern exprNode 
   exprNode_iterStart (/*@observer@*/ uentry p_name, /*@only@*/ exprNodeList p_alist);
-extern exprNode 
-  exprNode_numLiteral (ctype p_c, /*@temp@*/ cstring p_t, 
-                      /*@only@*/ fileloc p_loc, long p_val); 
+extern exprNode exprNode_numLiteral (ctype p_c, /*@temp@*/ cstring p_t, 
+                                    /*@only@*/ fileloc p_loc, long p_val) /*@*/ ; 
 extern void exprNode_initMod (void) /*@modifies internalState@*/ ;
 extern exprNode exprNode_for (/*@keep@*/ exprNode p_inc, /*@keep@*/ exprNode p_body);
 extern exprNode 
   exprNode_forPred (/*@only@*/ exprNode p_init, 
                    /*@only@*/ exprNode p_test, /*@only@*/ exprNode p_inc);
-extern exprNode 
-  exprNode_floatLiteral (double p_d, ctype p_ct, 
-                        cstring p_text, /*@only@*/ fileloc p_loc);
+extern exprNode exprNode_floatLiteral (double p_d, ctype p_ct, 
+                                      cstring p_text, /*@only@*/ fileloc p_loc) /*@*/ ;
 extern /*@notnull@*/ exprNode exprNode_createId (/*@observer@*/ uentry p_c);
 extern /*@notnull@*/ exprNode exprNode_makeConstantString (/*@temp@*/ cstring p_c, /*@only@*/ fileloc p_loc) /*@*/ ;
 extern exprNode exprNode_cast (/*@only@*/ lltok p_tok, /*@only@*/ exprNode p_e, /*@only@*/ qtype p_q);
@@ -377,10 +375,6 @@ extern void exprNode_freeShallow (/*@only@*/ exprNode p_e);
 extern void exprNode_destroyMod (void) /*@modifies internalState@*/ ;
 extern /*@falsewhennull@*/ bool exprNode_isAssign (exprNode p_e) /*@*/ ;
 
-/* added 8-15-00
-   by DRL */
-extern /*@observer@*/ fileloc exprNode_getfileloc (exprNode p_e) ;
-
 /*@-exportlocal@*/
 extern bool exprNode_isDefaultMarker (exprNode p_e) /*@*/ ;
 extern bool exprNode_isCaseMarker (exprNode p_e) /*@*/ ;