Fix

Author: web-flow

lib/tokenlist.cpp

@@ -1787,11 +1787,12 @@ static Token * createAstAtToken(Token *tok)
         }
     }
 
-    if (Token::Match(tok, "%type% %name%|*|&|&&|::") && !Token::Match(tok, "return|new|delete")) {
-        int typecount = 0;
+    if ((Token::Match(tok, "%type% %name%|*|&|&&|::") && !Token::Match(tok, "return|new|delete")) ||
+        (Token::Match(tok, ":: %tyoe%") && !tok->next()->isKeyword())) {
+        int typecount = tok->str() == "::" ? 1 : 0;
         Token *typetok = tok;
         while (Token::Match(typetok, "%type%|::|*|&|&&|<")) {
-            if (typetok->isName() && (!Token::simpleMatch(typetok->previous(), "::") || tok->str() == "::"))
+            if (typetok->isName() && !Token::simpleMatch(typetok->previous(), "::"))
                 typecount++;
             if (typetok->str() == "<") {
                 if (Token* closing = typetok->findClosingBracket()) {

test/testtokenize.cpp

@@ -425,6 +425,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(astrvaluedecl);
         TEST_CASE(astorkeyword);
         TEST_CASE(astenumdecl);
+        TEST_CASE(astfuncdecl);
 
         TEST_CASE(startOfExecutableScope);
 
@@ -7419,7 +7420,7 @@ class TestTokenizer : public TestFixture {
 
     void astfuncdecl() {
         ASSERT_EQUALS("", testAst("bool operator==(const S& a, const S& b);", AstStyle::Simple, ListSimplification::Full));
-        ASSERT_EQUALS("", testAst("::int32_t f() {}"));
+        ASSERT_EQUALS("", testAst("::int32_t f();"));
     }
 
 #define isStartOfExecutableScope(offset, code) isStartOfExecutableScope_(offset, code, __FILE__, __LINE__)