*** empty log message ***

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

diff --git a/src/Headers/constraintExpr.h b/src/Headers/constraintExpr.h
index 8fa2d474ca8eb4441e601d2cae5c65baa297c55b..1a35617ec96ce60b5119caad7f6f5fc3ce8b4437 100644 (file)
--- a/src/Headers/constraintExpr.h
+++ b/src/Headers/constraintExpr.h
@@ -31,8 +31,6 @@ extern /*@unused@*/ /*@truenull@*/ bool constraintExpr_isError (constraintExpr p
 
 void constraintExpr_free ( /*@only@*/ constraintExpr p_expr);
 
-int constraintExpr_getValue (constraintExpr p_expr) /*@*/;
-
 constraintExpr constraintExpr_setFileloc (/*@returned@*/ constraintExpr p_c, fileloc p_loc) /*@modifies p_c@*/;
 
 constraintExpr constraintExpr_copy (constraintExpr p_expr) /*@*/;
@@ -44,13 +42,15 @@ extern cstring constraintExpr_print (constraintExpr p_expr) /*@*/;
 bool constraintExpr_similar (constraintExpr p_expr1, constraintExpr p_expr2) /*@*/;
 bool constraintExpr_same (constraintExpr p_expr1, constraintExpr p_expr2) /*@*/;
 /*@only@*/ constraintExpr constraintExpr_searchandreplace (/*@only@*/ /*@unique@*/ constraintExpr p_c, /*@temp@*/ /*@observer@*/ constraintExpr p_old, /*@temp@*/ /*@observer@*/ constraintExpr p_newExpr ) /*@modifies p_c@*/;
+
 bool constraintExpr_canGetValue (constraintExpr p_expr) /*@*/;
+long constraintExpr_getValue (constraintExpr p_expr) /*@*/;
 
 int constraintExpr_compare (constraintExpr p_expr1, constraintExpr p_expr2) /*@*/;
 
 //constraintExpr constraintExpr_makeValueInt (int i);
 
-/*@only@*/ constraintExpr constraintExpr_makeIntLiteral (int p_i);
+/*@only@*/ constraintExpr constraintExpr_makeIntLiteral (long p_i);
 
 /*@only@*/ constraintExpr constraintExpr_makeValueExpr (/*@exposed@*/ exprNode p_expr);
 
@@ -71,7 +71,7 @@ bool constraintExpr_search (/*@observer@*/ /*@temp@*/ constraintExpr p_c, /*@obs
 /*@only@*/ fileloc constraintExpr_getFileloc (constraintExpr p_expr);
 
 
-/*@only@*/ constraintExpr constraintExpr_makeSRefMaxset ( /*@temp@*/ /*@oberver@*/ sRef p_s);
+/*@only@*/ constraintExpr constraintExpr_makeSRefMaxset ( /*@temp@*/ /*@observer@*/ sRef p_s);
 
 /*@only@*/ constraintExpr constraintExpr_makeSRefMaxRead(/*@temp@*/ /*@observer@*/ sRef p_s);
 
@@ -83,7 +83,7 @@ constraintExpr constraintExpr_doSRefFixBaseParam ( /*@returned@*/ constraintExpr
 
 /*@only@*/ constraintExpr constraintExpr_doFixResult (/*@only@*/  constraintExpr p_expr, /*@observer@*/ exprNode p_fcnCall);
 
-bool constraintExpr_isLit (constraintExpr p_expr);
+/*@falsenull@*/ bool constraintExpr_isLit (constraintExpr p_expr) /*@*/ ;
 
 /*@only@*/ constraintExpr constraintExpr_makeAddExpr (/*@only@*/ constraintExpr p_expr, /*@only@*/ constraintExpr p_addent);
 
@@ -104,15 +104,15 @@ constraintExpr constraintExpr_propagateConstants (/*@only@*/ constraintExpr p_ex
                                                /*@out@*/ bool * p_propagate,
                                                  /*@out@*/ int *p_literal);
 
-bool constraintExpr_isBinaryExpr (/*@observer@*/ /*@temp@*/ constraintExpr p_c);
+/*@falsenull@*/ bool constraintExpr_isBinaryExpr (/*@observer@*/ /*@temp@*/ constraintExpr p_c) /*@*/ ;
 
 extern void  constraintExpr_dump (/*@observer@*/ /*@temp@*/ constraintExpr p_expr,  FILE *p_f);
 
 extern /*@only@*/ constraintExpr  constraintExpr_undump (FILE *p_f);
 
-#else
+extern /*@only@*/ constraintExpr constraintExpr_makeTermExprNode (/*@exposed@*/ exprNode p_e) ;
 
 
+#else
 # error "Multiple include"
-
 #endif