better reset of exprid

Author: danmar

lib/symboldatabase.cpp

@@ -1735,7 +1735,8 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
         }
         for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (tok->varId() == 0 && tok->exprId() > 0 && tok->astParent() && !tok->astOperand1() && !tok->astOperand2()) {
-                if (Token::Match(tok->astParent(), "%name%|.|::"))
+                if (tok->isNumber() || tok->isKeyword() || Token::Match(tok->astParent(), ".|::") ||
+                    (Token::simpleMatch(tok->astParent(), "(") && precedes(tok, tok->astParent())))
                     tok->exprId(0);
             }
         }

test/testvarid.cpp

@@ -3898,8 +3898,8 @@ class TestVarID : public TestFixture {
                             "    while (b && y > 0) {}\n"
                             "}\n";
         const char expected[] = "1: void f ( bool b , int y ) {\n"
-                                "2: if ( b@1 &&@5 y@2 >@4 0@3 ) { }\n"
-                                "3: while ( b@1 &&@5 y@2 >@4 0@3 ) { }\n"
+                                "2: if ( b@1 &&@5 y@2 >@4 0 ) { }\n"
+                                "3: while ( b@1 &&@5 y@2 >@4 0 ) { }\n"
                                 "4: }\n";
         ASSERT_EQUALS(expected, tokenizeExpr(code));
     }