X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/abd7f89523564e5e238e5852585b98f72c3b48f4..52e90c0f77bb0e3edb043873b71a73459d4ae8ab:/src/constraint.c diff --git a/src/constraint.c b/src/constraint.c index ccdb179..cb87d10 100644 --- a/src/constraint.c +++ b/src/constraint.c @@ -39,8 +39,10 @@ /*@i33*/ -/*@access exprNode @*/ - +/*@access exprNode@*/ /* !!! NO! Don't do this recklessly! */ +/*@-nullderef@*/ /* !!! DRL needs to fix this code! */ +/*@-nullstate@*/ /* !!! DRL needs to fix this code! */ +/*@-temptrans@*/ /* !!! DRL needs to fix this code! */ static /*@only@*/ cstring constraint_printDetailedPostCondition (/*@observer@*/ /*@temp@*/ constraint p_c); @@ -119,14 +121,20 @@ constraint makeConstraintParse3 (constraintExpr l, lltok relOp, constraintExpr r ret->lexpr = constraintExpr_copy (l); - if (relOp.tok == GE_OP) + if (lltok_getTok (relOp) == GE_OP) + { ret->ar = GTE; - else if (relOp.tok == LE_OP) - ret->ar = LTE; - else if (relOp.tok == EQ_OP) - ret->ar = EQ; + } + else if (lltok_getTok (relOp) == LE_OP) + { + ret->ar = LTE; + } + else if (lltok_getTok (relOp) == EQ_OP) + { + ret->ar = EQ; + } else - llfatalbug ( message ("Unsupported relational operator")); + llfatalbug ( message ("Unsupported relational operator")); ret->expr = constraintExpr_copy (r);