From 0c91982e74c78776af1181899d97c99b395f6c34 Mon Sep 17 00:00:00 2001 From: drl7x Date: Wed, 5 Sep 2001 20:22:37 +0000 Subject: [PATCH] *** empty log message *** --- src/constraintExpr.c | 28 ++++++++++++++-------------- src/exprChecks.c | 3 +-- src/flags.def | 4 ++-- src/forjunk.c | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/constraintExpr.c b/src/constraintExpr.c index da05e6e..56d6fb3 100644 --- a/src/constraintExpr.c +++ b/src/constraintExpr.c @@ -141,14 +141,14 @@ static bool isZeroBinaryOp (constraintExpr expr) tempOp = constraintExprData_binaryExprGetOp (expr2->data); - if (op == PLUS) + if (op == BINARYOP_PLUS) op = tempOp; else if (op == MINUS) { - if (tempOp == PLUS) + if (tempOp == BINARYOP_PLUS) op = MINUS; else if (tempOp == MINUS) - op = PLUS; + op = BINARYOP_PLUS; else BADEXIT; } @@ -209,7 +209,7 @@ static bool isZeroBinaryOp (constraintExpr expr) *propagate = propagate1 || propagate2; - if (op == PLUS) + if (op == BINARYOP_PLUS) *literal = literal1 + literal2; else if (op == MINUS) *literal = literal1 - literal2; @@ -228,7 +228,7 @@ static bool isZeroBinaryOp (constraintExpr expr) constraintExpr_free (expr1); constraintExpr_free (expr2); - if (op == PLUS ) + if (op == BINARYOP_PLUS ) return (constraintExpr_makeIntLiteral ( (t1+t2) )); else if (op == MINUS) return (constraintExpr_makeIntLiteral ( (t1-t2) )); @@ -243,7 +243,7 @@ static bool isZeroBinaryOp (constraintExpr expr) *literal += constraintExpr_getValue (expr1); - if (op == PLUS) + if (op == BINARYOP_PLUS) { constraintExpr_free(expr1); constraintExpr_free(expr); @@ -275,7 +275,7 @@ static bool isZeroBinaryOp (constraintExpr expr) { *propagate = TRUE; - if ( op == PLUS ) + if ( op == BINARYOP_PLUS ) *literal += constraintExpr_getValue (expr2); else if (op == MINUS) *literal -= constraintExpr_getValue (expr2); @@ -728,7 +728,7 @@ constraintExpr constraintExpr_parseMakeBinaryOp (/*@only@*/ constraintExpr expr1 constraintExpr ret; ret = constraintExpr_makeBinaryOpConstraintExpr (expr1, expr2); if (op.tok == TPLUS) - ret->data = constraintExprData_binaryExprSetOp(ret->data, PLUS); + ret->data = constraintExprData_binaryExprSetOp(ret->data, BINARYOP_PLUS); else if (op.tok == TMINUS) ret->data = constraintExprData_binaryExprSetOp(ret->data, MINUS); else @@ -759,7 +759,7 @@ constraintExpr constraintExpr_makeBinaryOpConstraintExprIntLiteral (/*@only@*/ c constExpr = constraintExpr_makeIntLiteral (literal); ret = constraintExpr_makeBinaryOpConstraintExpr (expr, constExpr); - ret->data = constraintExprData_binaryExprSetOp(ret->data, PLUS); + ret->data = constraintExprData_binaryExprSetOp(ret->data, BINARYOP_PLUS); return ret; } @@ -797,7 +797,7 @@ constraintExpr addent) DPRINTF ( (message ("Doing addTerm simplification") ) ); ret = constraintExpr_makeBinaryOpConstraintExpr (expr, addent); - ret->data = constraintExprData_binaryExprSetOp (ret->data, PLUS); + ret->data = constraintExprData_binaryExprSetOp (ret->data, BINARYOP_PLUS); return ret; } @@ -810,7 +810,7 @@ constraintExpr constraintExpr_makeIncConstraintExpr (/*@only@*/ constraintExpr e inc = constraintExpr_makeIntLiteral (1); ret = constraintExpr_makeBinaryOpConstraintExpr (expr, inc); - ret->data = constraintExprData_binaryExprSetOp(ret->data, PLUS); + ret->data = constraintExprData_binaryExprSetOp(ret->data, BINARYOP_PLUS); return ret; } @@ -840,7 +840,7 @@ static cstring constraintExprBinaryOpKind_print (constraintExprBinaryOpKind op) switch (op) { - case PLUS: + case BINARYOP_PLUS: return message("+"); case MINUS: return message("-"); @@ -1179,7 +1179,7 @@ static /*@only@*/ constraintExpr constraintExpr_simplifybinaryExpr (/*@only@*/co lexpr->data = copyExprData (expr1->data, expr1->kind); constraintExpr_free(expr1); - if (op == PLUS) + if (op == BINARYOP_PLUS) expr = constraintExpr_makeSubtractExpr (expr, expr2); else if (op == MINUS) expr = constraintExpr_makeAddExpr (expr, expr2); @@ -1283,7 +1283,7 @@ static /*@only@*/ constraintExpr constraintExpr_simplifyunaryExpr (/*@only@*/ co return c; } - if (constraintExprData_binaryExprGetOp (exp->data) == PLUS ) + if (constraintExprData_binaryExprGetOp (exp->data) == BINARYOP_PLUS ) { /* if (constraintExpr_canGetValue (constraintExprData_binaryExprGetExpr2 (exp->data) ) ) */ diff --git a/src/exprChecks.c b/src/exprChecks.c index 4beef3a..72e160b 100644 --- a/src/exprChecks.c +++ b/src/exprChecks.c @@ -1058,13 +1058,12 @@ void exprNode_checkFunction (/*@unused@*/ uentry ue, /*@only@*/ exprNode fcnBody } body->ensuresConstraints = constraintList_sort(body->ensuresConstraints); - + if ( context_getFlag (FLG_FUNCTIONPOST) ) { constraintList_printError(body->ensuresConstraints, g_currentloc); } - /* ConPrint (message ("Unable to resolve function constraints:\n%s", constraintList_printDetailed(body->requiresConstraints) ), g_currentloc); ConPrint (message ("LCLint has found function post conditions:\n%s", constraintList_printDetailed(body->ensuresConstraints) ), g_currentloc); diff --git a/src/flags.def b/src/flags.def index 7450189..8c63e8f 100644 --- a/src/flags.def +++ b/src/flags.def @@ -2816,7 +2816,7 @@ static flaglist flags = "parenconstraint", FLG_PARENCONSTRAINT, "parenthesize constraint term", - "This flag is for debuging. This flag causes LCLint to fully parentheses constraints, ", + "This flag is for debugging. This flag causes LCLint to fully parentheses constraints, ", 0, 0 }, @@ -2825,7 +2825,7 @@ static flaglist flags = "debugfcnconstraint", FLG_DEBUGFUNCTIONCONSTRAINT, "debuging constraint flas", - "This flag is for debuging. It causes lclint to perform buffer overflow checking even if the error will be surpressed. Normal buffer overflow checking will only be performed if errors would be printed. ", + "This flag is for debuging. It causes lclint to perform buffer overflow checking even if the errors would be surpressed. Normally buffer overflow checking will only be performed if the errors would be printed. ", 0, 0 }, diff --git a/src/forjunk.c b/src/forjunk.c index e8e1ec0..5e36d9e 100644 --- a/src/forjunk.c +++ b/src/forjunk.c @@ -31,7 +31,7 @@ static bool isInc (/*@observer@*/ constraintExpr c) /*@*/ t2 = constraintExprData_binaryExprGetExpr2 (c->data); binOP = constraintExprData_binaryExprGetOp (c->data); - if (binOP == PLUS) + if (binOP == BINARYOP_PLUS) if (constraintExpr_isLit (t2) && constraintExpr_getValue (t2) == 1 ) { return TRUE; -- 2.45.2