Fix #14972 [regression] Syntax Error: AST broken, '!' doesn't have an operand.

Author: web-flow

lib/tokenize.cpp

@@ -5238,7 +5238,7 @@ static Token * matchMemberVarName(const Member &var, const std::list<ScopeInfo2>
 {
     Token *tok = matchMemberName(var, scopeInfo);
     if (Token::Match(tok, "%name%")) {
-        if (!tok->next() || tok->strAt(1) != "(" || (tok->tokAt(2) && tok->tokAt(2)->isLiteral()))
+        if (!tok->next() || tok->strAt(1) != "(" || (tok->tokAt(2) && (tok->tokAt(2)->isLiteral() || tok->tokAt(2)->isOp())))
             return tok;
     }
     return nullptr;
@@ -5338,7 +5338,7 @@ void Tokenizer::setVarIdPass2()
             }
             if (!tok->next())
                 syntaxError(tok);
-            if (Token::Match(tok, "%name% (") && !(tok->tokAt(2) && tok->tokAt(2)->isLiteral()))
+            if (Token::Match(tok, "%name% (") && !(tok->tokAt(2) && (tok->tokAt(2)->isLiteral() || tok->tokAt(2)->isOp())))
                 allMemberFunctions.emplace_back(scope, usingnamespaces, tok1);
             else
                 allMemberVars.emplace_back(scope, usingnamespaces, tok1);

test/testvarid.cpp

@@ -222,6 +222,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(varidclass18);
         TEST_CASE(varidclass19);  // initializer list
         TEST_CASE(varidclass20);   // #7578: int (*p)[2]
+        TEST_CASE(varidclass21);
         TEST_CASE(varid_classnameshaddowsvariablename); // #3990
         TEST_CASE(varid_classnametemplate); // #10221
 
@@ -4021,6 +4022,14 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varidclass21() {
+        const char code[] = "struct T { static bool b; };\n" // #14972
+                            "bool T::b(!false);\n";
+        const char expected[] = "1: struct T { static bool b@1 ; } ;\n"
+                                "2: bool T :: b@1 ( ! false ) ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varidenum1() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"