*** empty log message ***

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

diff --git a/src/Headers/uentry.h b/src/Headers/uentry.h
index e804f3ab88858326362819b1d2adf49a3eafb29b..b193d3d1a5e280d1789a637d7d3002772789b007 100644 (file)
--- a/src/Headers/uentry.h
+++ b/src/Headers/uentry.h
@@ -17,8 +17,7 @@
 
 typedef struct 
 {
-  /*@only@*/ multiVal val;
-            typeIdSet access;
+  typeIdSet access;
 } *ucinfo;
 
 typedef enum 
@@ -104,8 +103,8 @@ typedef struct
   bool hasGlobs BOOLBITS;
   bool hasMods  BOOLBITS;
 
-  constraintList preconditions;
-  constraintList postconditions;
+  functionConstraint preconditions;
+  functionConstraint postconditions;
   
 } *ufinfo ;
 
@@ -418,6 +417,7 @@ extern /*@notnull@*/ /*@only@*/ uentry
 extern /*@notnull@*/ uentry uentry_makeElipsisMarker (void) /*@*/ ;
 
 extern void uentry_makeVarFunction (/*@temp@*/ uentry p_ue) /*@modifies p_ue@*/ ;
+extern void uentry_makeConstantFunction (/*@temp@*/ uentry p_ue) /*@modifies p_ue@*/ ;
 
 extern bool uentry_isElipsisMarker (/*@sef@*/ uentry p_u) /*@*/ ;
 # define uentry_isElipsisMarker(u) \
@@ -457,12 +457,12 @@ extern /*@notnull@*/ /*@only@*/ uentry
 
 # ifndef NOLCL
 extern /*@notnull@*/ /*@only@*/ 
-  uentry uentry_makeVariableParam (cstring p_n, ctype p_t);
+  uentry uentry_makeVariableParam (cstring p_n, ctype p_t, fileloc p_loc);
 # endif
 
 extern /*@notnull@*/ /*@only@*/ 
-  uentry uentry_makeVariableSrefParam (cstring p_n, ctype p_t, 
-                                      /*@exposed@*/ sRef p_s);
+uentry uentry_makeVariableSrefParam (cstring p_n, ctype p_t, /*@only@*/ fileloc p_loc,
+                                    /*@exposed@*/ sRef p_s);
 extern /*@notnull@*/ /*@only@*/ 
   uentry uentry_makeIdFunction (idDecl p_id);
 extern /*@notnull@*/ /*@only@*/ 
@@ -545,6 +545,8 @@ extern bool uentry_hasGlobs (uentry p_ue) /*@*/ ;
 extern bool uentry_hasMods (uentry p_ue) /*@*/ ;
 
 extern bool uentry_hasStateClauseList (uentry p_ue) /*@*/ ;
+extern bool uentry_hasConditions (uentry p_ue) /*@*/ ;
+
 extern exitkind uentry_getExitCode (uentry p_ue) /*@*/ ;
 
 extern void uentry_checkYieldParam (uentry p_old, uentry p_unew);
@@ -638,7 +640,7 @@ extern bool uentry_hasBufStateInfo (uentry p_ue);
 extern uentry uentry_makeGlobalMarker (void) ;
 extern bool uentry_isGlobalMarker (uentry) /*@*/ ;
 
-extern /*@exposed@*/ uentry uentry_makeUnrecognized (cstring p_c, /*@keep@*/ fileloc p_loc);
+extern /*@exposed@*/ uentry uentry_makeUnrecognized (cstring p_c, /*@only@*/ fileloc p_loc);
 
 # ifdef DOANNOTS
 typedef enum { AN_UNKNOWN, AN_FCNRETURN, AN_FCNPARAM, AN_SUFIELD, AN_TDEFN, AN_GSVAR,
@@ -650,16 +652,18 @@ extern void printAnnots (void);
 extern void uentry_tallyAnnots (uentry u, ancontext kind);
 # endif /* DOANNOTS */
 
+extern bool uentry_hasMetaStateEnsures (uentry p_e) /*@*/ ;
+extern /*@only@*/ metaStateConstraintList uentry_getMetaStateEnsures (uentry p_e);
+
 /* start modifications */
 //extern void uentry_setBufferSize (uentry p_e, exprNode p_cconstant);
 /*drl7x*/
 extern constraintList uentry_getFcnPreconditions (uentry p_ue);
 extern constraintList uentry_getFcnPostconditions (uentry p_ue);
-extern void
-uentry_setPostconditions (uentry p_ue, /*@only@*/ constraintList p_postconditions);
 
-extern void
-uentry_setPreconditions (uentry p_ue, /*@only@*/ constraintList p_preconditions);
+extern void uentry_setPostconditions (uentry p_ue, /*@only@*/ functionConstraint p_postconditions);
+
+extern void uentry_setPreconditions (uentry p_ue, /*@only@*/ functionConstraint p_preconditions);
 
      /*end mods*/