Merged code tree with Dave Evans's version. Many changes to numberous to list....

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

diff --git a/src/Headers/constraintExpr.h b/src/Headers/constraintExpr.h
index 98eddd28da259966bd183debd87ba53c2fe43bc7..8fa2d474ca8eb4441e601d2cae5c65baa297c55b 100644 (file)
--- a/src/Headers/constraintExpr.h
+++ b/src/Headers/constraintExpr.h
@@ -10,7 +10,7 @@ typedef enum
 }
 constraintExprKind;
 
-struct _constraintExpr {
+struct s_constraintExpr {
   constraintExprKind kind;
   constraintExprData data;
 };
@@ -29,85 +29,86 @@ extern /*@unused@*/ /*@truenull@*/ bool constraintExpr_isError (constraintExpr p
 # define constraintExpr_isError(e)          ((e) == constraintExpr_undefined)
 
 
-void constraintExpr_free ( /*@only@*/ constraintExpr expr);
+void constraintExpr_free ( /*@only@*/ constraintExpr p_expr);
 
-int constraintExpr_getValue (constraintExpr expr) /*@*/;
+int constraintExpr_getValue (constraintExpr p_expr) /*@*/;
 
-constraintExpr constraintExpr_setFileloc (/*@returned@*/ constraintExpr c, fileloc loc) /*@modifies c@*/;
+constraintExpr constraintExpr_setFileloc (/*@returned@*/ constraintExpr p_c, fileloc p_loc) /*@modifies p_c@*/;
 
-constraintExpr constraintExpr_copy (constraintExpr expr) /*@*/;
+constraintExpr constraintExpr_copy (constraintExpr p_expr) /*@*/;
 
-/*@only@*/ cstring constraintExpr_unparse (/*@temp@*/ /*@observer@*/ constraintExpr ex) /*@*/;
-extern cstring constraintExpr_print (constraintExpr expr) /*@*/;
+/*@only@*/ cstring constraintExpr_unparse (/*@temp@*/ /*@observer@*/ constraintExpr p_ex) /*@*/;
+extern cstring constraintExpr_print (constraintExpr p_expr) /*@*/;
 
 
-bool constraintExpr_similar (constraintExpr expr1, constraintExpr expr2) /*@*/;
-bool constraintExpr_same (constraintExpr expr1, constraintExpr expr2) /*@*/;
-/*@only@*/ constraintExpr constraintExpr_searchandreplace (/*@only@*/ /*@unique@*/ constraintExpr c, /*@observer@*/ constraintExpr old, /*@observer@*/ constraintExpr new ) /*@modifies c@*/;
-bool constraintExpr_canGetValue (constraintExpr 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) /*@*/;
 
-int constraintExpr_compare (constraintExpr expr1, constraintExpr expr2) /*@*/;
+int constraintExpr_compare (constraintExpr p_expr1, constraintExpr p_expr2) /*@*/;
 
 //constraintExpr constraintExpr_makeValueInt (int i);
 
-/*@only@*/ constraintExpr constraintExpr_makeIntLiteral (int i);
+/*@only@*/ constraintExpr constraintExpr_makeIntLiteral (int p_i);
 
-/*@only@*/ constraintExpr constraintExpr_makeValueExpr (/*@exposed@*/ exprNode expr);
+/*@only@*/ constraintExpr constraintExpr_makeValueExpr (/*@exposed@*/ exprNode p_expr);
 
-/*@only@*/ constraintExpr constraintExpr_makeMaxSetExpr (/*@exposed@*/ exprNode expr);
+/*@only@*/ constraintExpr constraintExpr_makeMaxSetExpr (/*@exposed@*/ exprNode p_expr);
 
-/*@only@*/ constraintExpr  constraintExpr_makeMaxReadExpr (/*@exposed@*/ exprNode expr);
+/*@only@*/ constraintExpr  constraintExpr_makeMaxReadExpr (/*@exposed@*/ exprNode p_expr);
 
-/*@only@*/ constraintExpr constraintExpr_makeIncConstraintExpr (/*@only@*/ constraintExpr expr);
+/*@only@*/ constraintExpr constraintExpr_makeIncConstraintExpr (/*@only@*/ constraintExpr p_expr);
 
-/*@only@*/ constraintExpr constraintExpr_makeDecConstraintExpr (/*@only@*/ constraintExpr expr);
+/*@only@*/ constraintExpr constraintExpr_makeDecConstraintExpr (/*@only@*/ constraintExpr p_expr);
 
-/*@only@*/ constraintExpr constraintExpr_simplify (/*@only@*/ constraintExpr c);
+/*@only@*/ constraintExpr constraintExpr_simplify (/*@only@*/ constraintExpr p_c);
 
-/*@only@*/ constraintExpr constraintExpr_solveBinaryExpr (constraintExpr lexpr, /*@only@*/ constraintExpr expr) /*@modifies lexpr, expr @*/;
+/*@only@*/ constraintExpr constraintExpr_solveBinaryExpr (constraintExpr p_lexpr, /*@only@*/ constraintExpr p_expr) /*@modifies p_lexpr, p_expr @*/;
 
-bool constraintExpr_search (/*@observer@*/ constraintExpr c, /*@observer@*/ constraintExpr old);
+bool constraintExpr_search (/*@observer@*/ /*@temp@*/ constraintExpr p_c, /*@observer@*/ /*@temp@*/ constraintExpr p_old);
 
-/*@only@*/ fileloc constraintExpr_getFileloc (constraintExpr expr);
+/*@only@*/ fileloc constraintExpr_getFileloc (constraintExpr p_expr);
 
 
-/*@only@*/ constraintExpr constraintExpr_makeSRefMaxset ( /*@exposed@*/ sRef s);
+/*@only@*/ constraintExpr constraintExpr_makeSRefMaxset ( /*@temp@*/ /*@oberver@*/ sRef p_s);
 
-/*@only@*/ constraintExpr constraintExpr_makeTermsRef (/*@exposed@*/ sRef s);
+/*@only@*/ constraintExpr constraintExpr_makeSRefMaxRead(/*@temp@*/ /*@observer@*/ sRef p_s);
 
-constraintExpr constraintExpr_doSRefFixBaseParam ( /*@returned@*/ constraintExpr expr, exprNodeList arglist);
+/*@only@*/ constraintExpr constraintExpr_makeTermsRef (/*@temp@*/ sRef  p_s);
 
-/*@only@*/ constraintExpr constraintExpr_makeExprNode (/*@exposed@*/ exprNode e);
+constraintExpr constraintExpr_doSRefFixBaseParam ( /*@returned@*/ constraintExpr p_expr, exprNodeList p_arglist);
 
-/*@only@*/ constraintExpr constraintExpr_doFixResult (/*@only@*/  constraintExpr expr, /*@exposed@*/ exprNode fcnCall);
+/*@only@*/ constraintExpr constraintExpr_makeExprNode (/*@dependent@*/  exprNode p_e);
 
-bool constraintExpr_isLit (constraintExpr expr);
+/*@only@*/ constraintExpr constraintExpr_doFixResult (/*@only@*/  constraintExpr p_expr, /*@observer@*/ exprNode p_fcnCall);
 
-/*@only@*/ constraintExpr constraintExpr_makeAddExpr (/*@only@*/ constraintExpr expr, /*@only@*/ constraintExpr addent);
+bool constraintExpr_isLit (constraintExpr p_expr);
 
-/*@only@*/  constraintExpr constraintExpr_makeSubtractExpr (/*@only@*/ constraintExpr expr, /*@only@*/ constraintExpr addent);
+/*@only@*/ constraintExpr constraintExpr_makeAddExpr (/*@only@*/ constraintExpr p_expr, /*@only@*/ constraintExpr p_addent);
 
-/*@only@*/ constraintExpr constraintExpr_parseMakeUnaryOp (lltok op,/*@only@*/ constraintExpr cexpr);
+/*@only@*/  constraintExpr constraintExpr_makeSubtractExpr (/*@only@*/ constraintExpr p_expr, /*@only@*/ constraintExpr p_addent);
 
-constraintExpr constraintExpr_parseMakeBinaryOp (/*@only@*/ constraintExpr expr1, lltok op, /*@only@*/ constraintExpr expr2);
+/*@only@*/ constraintExpr constraintExpr_parseMakeUnaryOp (lltok p_op,/*@only@*/ constraintExpr p_cexpr);
 
-bool constraintExpr_hasMaxSet (/*@observer@*/ constraintExpr expr);
+constraintExpr constraintExpr_parseMakeBinaryOp (/*@only@*/ constraintExpr p_expr1, lltok p_op, /*@only@*/ constraintExpr p_expr2);
 
+bool constraintExpr_hasMaxSet (/*@observer@*/ /*@temp@*/ constraintExpr p_expr);
 
-/*@only@*/ constraintExpr constraintExpr_makeSRefMaxRead(/*@exposed@*/ sRef s);
 
-/*@only@*/ constraintExpr constraintExpr_doSRefFixConstraintParam (/*@returned@*/ /*@only@*/ constraintExpr expr, exprNodeList arglist) /*@modifies expr@*/;
+
+/*@only@*/ constraintExpr constraintExpr_doSRefFixConstraintParam (/*@returned@*/ /*@only@*/ constraintExpr p_expr, exprNodeList p_arglist) /*@modifies p_expr@*/;
 
 /*@only@*/
-constraintExpr constraintExpr_propagateConstants (/*@only@*/ constraintExpr expr,
-                                               /*@out@*/ bool * propagate,
-                                                 /*@out@*/ int *literal);
+constraintExpr constraintExpr_propagateConstants (/*@only@*/ constraintExpr p_expr,
+                                               /*@out@*/ bool * p_propagate,
+                                                 /*@out@*/ int *p_literal);
 
-bool constraintExpr_isBinaryExpr (/*@observer@*/ constraintExpr c);
+bool constraintExpr_isBinaryExpr (/*@observer@*/ /*@temp@*/ constraintExpr p_c);
 
-extern void  constraintExpr_dump (/*@observer@*/ constraintExpr expr,  FILE *f);
+extern void  constraintExpr_dump (/*@observer@*/ /*@temp@*/ constraintExpr p_expr,  FILE *p_f);
 
-extern /*@only@*/ constraintExpr  constraintExpr_undump (FILE *f);
+extern /*@only@*/ constraintExpr  constraintExpr_undump (FILE *p_f);
 
 #else