Committing after merging Evan's changes.

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

diff --git a/src/Headers/constraintTerm.h b/src/Headers/constraintTerm.h
index 673de12e0b3f0c45d4dbcff32a6e04c87260b9f3..90d6764308d3ae216d9810782683e8df819f74f6 100644 (file)
--- a/src/Headers/constraintTerm.h
+++ b/src/Headers/constraintTerm.h
@@ -9,13 +9,12 @@ typedef union
   long intlit;
 } constraintTermValue;
 
-/*@-namechecks@*/
-
 typedef enum
 {
-  ERRORBADCONSTRAINTTERMTYPE,
- EXPRNODE, SREF,
- INTLITERAL
+  CTT_ERRORBADCONSTRAINTTERMTYPE,
+  CTT_EXPR, 
+  CTT_SREF,
+  CTT_INTLITERAL
 } constraintTermType;
 
 struct _constraintTerm {
@@ -50,8 +49,6 @@ fileloc constraintTerm_getFileloc (constraintTerm t) /*@*/;
 
 bool constraintTerm_isIntLiteral (constraintTerm term) /*@*/;
 
-cstring constraintTerm_print (constraintTerm term) /*@*/;
-
 constraintTerm constraintTerm_makesRef  (/*@temp@*/ /*@observer@*/ sRef s) /*@*/;
 
 /*@unused@*/ bool constraintTerm_probSame (constraintTerm term1, constraintTerm term2) /*@*/;
@@ -66,31 +63,21 @@ cstring constraintTerm_getStringLiteral (constraintTerm c) /*@*/;
 
 constraintTerm constraintTerm_doSRefFixBaseParam (/*@returned@*/ constraintTerm term, exprNodeList arglist) /*@modifies term@*/;
 
-void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f);
-
-/*@only@*/ constraintTerm constraintTerm_undump ( FILE *f);
-
-bool constraintTerm_isInitBlock (/*@observer@*/ /*@temp@*/ constraintTerm p_c) /*@*/;
-
-int constraintTerm_getInitBlockLength (/*@observer@*/ /*@temp@*/ constraintTerm p_c) /*@*/;
-
-bool constraintTerm_isExprNode (/*@observer@*/ /*@temp@*/ constraintTerm c) /*@*/;
-
+extern cstring constraintTerm_unparse (constraintTerm)  /*@*/ ;
 
+extern void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f);
+extern /*@only@*/ constraintTerm constraintTerm_undump ( FILE *f);
+extern bool constraintTerm_isInitBlock (/*@observer@*/ /*@temp@*/ constraintTerm p_c) /*@*/;
+extern int constraintTerm_getInitBlockLength (/*@observer@*/ /*@temp@*/ constraintTerm p_c) /*@*/;
+extern bool constraintTerm_isExprNode (/*@observer@*/ /*@temp@*/ constraintTerm c) /*@*/;
 extern ctype constraintTerm_getCType (constraintTerm term);
 
-/*@exposed@*/ exprNode constraintTerm_getExprNode (constraintTerm t);
-
-/*@exposed@*/ sRef constraintTerm_getsRef (constraintTerm t);
-
-
-/*@=namechecks@*/
+extern /*@exposed@*/ exprNode constraintTerm_getExprNode (constraintTerm t);
+extern /*@exposed@*/ sRef constraintTerm_getsRef (constraintTerm t);
 
 /*drl added 12/19/2002*/
-bool  constraintTerm_isConstantOnly ( constraintTerm p_term );
+extern bool constraintTerm_isConstantOnly (constraintTerm p_term);
      
 #else
-
-#error Multiple Include
-
+#error "Multiple Include!"
 #endif