Fixed cppcheck-opensource#6898 (Token::expressionString: wrong output when first token is post-incremented)

danmar · danmar · commit 251f6d2a1580 · 2015-07-31T07:03:52.000+02:00
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -1191,7 +1191,8 @@ std::string Token::expressionString() const
 {
     const Token * const top = this;
     const Token *start = top;
-    while (start->astOperand1() && (start->astOperand2() || Token::simpleMatch(start, "( )")))
+    while (start->astOperand1() &&
+           (start->astOperand2() || !start->isUnaryPreOp() || Token::simpleMatch(start, "( )")))
         start = start->astOperand1();
     const Token *end = top;
     while (end->astOperand1() && (end->astOperand2() || end->isUnaryPreOp())) {
@@ -1208,7 +1209,6 @@ std::string Token::expressionString() const
             ret += " ";
     }
     return ret + end->str();
-
 }
 
 static void astStringXml(const Token *tok, std::size_t indent, std::ostream &out)
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -1521,6 +1521,13 @@ class TestCondition : public TestFixture {
               "}");
         ASSERT_EQUALS("[test.cpp:4]: (style) Condition !x is always true\n", errout.str());
 
+        check("void f() {\n" // #6898 (Token::expressionString)
+              "  int x = 0;\n"
+              "  A(x++ == 1);\n"
+              "  A(x++ == 2);\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:4]: (style) Condition x++==2 is always false\n", errout.str());
+
         // Avoid FP when condition comes from macro
         check("void f() {\n"
               "  int x = 0;\n"

Original file line number	Diff line number	Diff line change
`@@ -1191,7 +1191,8 @@ std::string Token::expressionString() const`
`1191`	`1191`	`{`
`1192`	`1192`	`const Token * const top = this;`
`1193`	`1193`	`const Token *start = top;`
`1194`		`- while (start->astOperand1() && (start->astOperand2() \|\| Token::simpleMatch(start, "( )")))`
	`1194`	`+ while (start->astOperand1() &&`
	`1195`	`+ (start->astOperand2() \|\| !start->isUnaryPreOp() \|\| Token::simpleMatch(start, "( )")))`
`1195`	`1196`	`start = start->astOperand1();`
`1196`	`1197`	`const Token *end = top;`
`1197`	`1198`	`while (end->astOperand1() && (end->astOperand2() \|\| end->isUnaryPreOp())) {`
`@@ -1208,7 +1209,6 @@ std::string Token::expressionString() const`
`1208`	`1209`	`ret += " ";`
`1209`	`1210`	`}`
`1210`	`1211`	`return ret + end->str();`
`1211`		`-`
`1212`	`1212`	`}`
`1213`	`1213`
`1214`	`1214`	`static void astStringXml(const Token *tok, std::size_t indent, std::ostream &out)`