Renamings to avoid conflicts with type names.

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

diff --git a/src/Headers/context.h b/src/Headers/context.h
index 2493d3121c62ac15e36b2c444e8d7e4cf8220d11..4d5929ec1866516f67bc7fa0fdfde55f9b1c9029 100644 (file)
--- a/src/Headers/context.h
+++ b/src/Headers/context.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.
 **
 */
@@ -154,6 +154,9 @@ extern int context_getLineLen (void) /*@*/ ;
 extern int context_getIndentSpaces (void) /*@*/ ;
 # define context_getIndentSpaces() ((int)context_getValue(FLG_INDENTSPACES))
 
+extern int context_getLocIndentSpaces (void) /*@*/ ;
+# define context_getLocIndentSpaces() ((int)context_getValue(FLG_LOCINDENTSPACES))
+
 extern int context_getValue (flagcode p_flag) /*@*/ ;
 extern void context_setValueAndFlag (flagcode p_flag, int p_val) 
    /*@modifies internalState@*/ ;
@@ -328,29 +331,15 @@ extern void context_addAnnotation (/*@only@*/ annotationInfo)
 extern void context_addMetaState (/*@only@*/ cstring, /*@only@*/ metaStateInfo)
      /*@modifies internalState@*/ ;
 
-extern valueTable context_createValueTable (sRef p_s, /*@only@*/ stateInfo p_sinfo)
+extern valueTable context_createValueTable (sRef p_s, /*@only@*/ stateInfo p_info)
      /*@globals internalState@*/ ;
 
-extern valueTable context_createGlobalMarkerValueTable (/*@only@*/ stateInfo p_sinfo)
+extern valueTable context_createGlobalMarkerValueTable (/*@only@*/ stateInfo p_info)
      /*@globals internalState@*/ ;
 
 extern int context_getBugsLimit (void) /*@*/ ;
 # define context_getBugsLimit()  ((int)context_getValue(FLG_BUGSLIMIT))
 
-/*drl 12/30/2001 these are some ugly functions that were added to facilitate struct annotations */
-/*drl 1/6/2001: I didn't think these functions were solid enough to include in the
-  stable  release of splint.  I commented them out so that they won't break anything
-  but didn't delete them because they will be fixed and included later
-*/
-
-/*extern void  setGlobalStructInfo(ctype p_ct, constraintList p_list); */
-
-/*extern constraintList getInvariants (ctype p_ct); */
-
-/* static int getSref (ctype ct, sRef s); */
-
-/* sRef fixSref (ctype p_ct, sRef p_base, sRef p_fix); */
-
 extern ctype context_setLastStruct (/*@returned@*/ ctype p_s) /*@modifies internalState@*/;
 extern ctype context_getLastStruct (/*@returned@*/ /*ctype p_s*/) /*@modifies internalState@*/;
 
@@ -359,6 +348,12 @@ extern ctype context_getLastStruct (/*@returned@*/ /*ctype p_s*/) /*@modifies in
 extern bool context_inOldStyleScope (void) /*@*/ ;
 extern void context_setGlobalStructInfo (ctype p_ct, constraintList p_list) /*@modifies internalState@*/ ;
 
+/*drl added 3/5/2003*/
+
+extern bool context_inSizeof (void);
+extern void context_enterSizeof (void);
+extern void context_leaveSizeof (void);
+
 # else
 # error "Multiple include"
 # endif