fix

Author: danmar

lib/tokenize.cpp

@@ -2651,13 +2651,13 @@ namespace {
         }
 
         if (Token::Match(tok1, "%name% (") && TokenList::isFunctionHead(tok1->next(), "{;:")) {
-            if (Token::Match(tok1->previous(), "%name%"))
+            if (Token::Match(tok1->previous(), "%name%") && !tok1->previous()->isControlFlowKeyword())
                 return false;
             if (Token::Match(tok1->previous(), ">|>>") && tok1->previous()->link())
                 return false;
             if (Token::Match(tok1->previous(), "*|&|&&")) {
                 const Token* prev = tok1->previous();
-                while (Token::Match(prev, "%name%|*|&|&&|::"))
+                while (Token::Match(prev, "%name%|*|&|&&|::") && !prev->isControlFlowKeyword())
                     prev = prev->previous();
                 if (Token::Match(prev, ">|>>") && tok1->previous()->link())
                     return false;
@@ -3012,18 +3012,12 @@ bool Tokenizer::simplifyUsing()
         if (Token::Match(start, "class|struct|union|enum"))
             start = start->next();
 
-        Token *startToken = usingEnd;
-        for (const Token* tok2 = nameToken->tokAt(2); Token::Match(tok2, "%name%|::"); tok2 = tok2->next()) {
-            if (Token::Match(tok2, "%name% <")) {
-                // Unfortunately we have to start searching from the beginning
-                // of the token stream because templates are instantiated at
-                // the end of the token stream and it may be used before then.
-                startToken = list.front();
-            }
-        }
-
+        // Unfortunately we have to start searching from the beginning
+        // of the token stream because templates are instantiated at
+        // the end of the token stream and it may be used before then.
         ScopeInfo3 scopeInfo1;
         ScopeInfo3 *currentScope1 = &scopeInfo1;
+        Token *startToken = list.front();
         Token *endToken = nullptr;
         bool inMemberFunc = false;
         const ScopeInfo3 * memberFuncScope = nullptr;

test/testsimplifyusing.cpp

@@ -91,6 +91,7 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing10173);
         TEST_CASE(simplifyUsing10335);
         TEST_CASE(simplifyUsing10720);
+        TEST_CASE(simplifyUsing13873); // function declaration
 
         TEST_CASE(scopeInfo1);
         TEST_CASE(scopeInfo2);
@@ -1586,6 +1587,20 @@ class TestSimplifyUsing : public TestFixture {
         TODO_ASSERT(startsWith(errout_str(), "[test.cpp:6]: (debug) Failed to parse 'using C = S < S < S < int"));
     }
 
+    void simplifyUsing13873() { // function declaration
+        const char code1[] = "using NS1::f;\n"
+                             "namespace NS1 { void f(); }\n";
+        ASSERT_EQUALS("namespace NS1 { void f ( ) ; }", tok(code1));
+
+        const char code2[] = "using NS1::f;\n"
+                             "void bar() { f(); }\n";
+        ASSERT_EQUALS("void bar ( ) { NS1 :: f ( ) ; }", tok(code2));
+
+        const char code3[] = "using NS1::f;\n"
+                             "namespace NS1 { void* f(); }\n";
+        ASSERT_EQUALS("namespace NS1 { void * f ( ) ; }", tok(code3));
+    }
+
     void scopeInfo1() {
         const char code[] = "struct A {\n"
                             "    enum class Mode { UNKNOWN, ENABLED, NONE, };\n"

test/testtokenize.cpp

@@ -480,7 +480,6 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(constFunctionPtrTypedef); // #12135
 
         TEST_CASE(simplifyPlatformTypes);
-        TEST_CASE(simplifyUsing1);
 
         TEST_CASE(dumpFallthrough);
     }
@@ -8534,21 +8533,6 @@ class TestTokenizer : public TestFixture {
         }
     }
 
-    void simplifyUsing1() {
-        // #13873
-        const char code1[] = "using NS1::f;\n"
-                             "namespace NS1 { void f(); }\n";
-        ASSERT_EQUALS("namespace NS1 { void f ( ) ; }", tokenizeAndStringify(code1));
-
-        const char code2[] = "using NS1::f;\n"
-                             "void bar() { f(); }\n";
-        ASSERT_EQUALS("void bar ( ) { NS1 :: f ( ) ; }", tokenizeAndStringify(code2));
-
-        const char code3[] = "using NS1::f;\n"
-                             "namespace NS1 { void* f(); }\n";
-        ASSERT_EQUALS("namespace NS1 { void * f ( ) ; }", tokenizeAndStringify(code3));
-    }
-
     void dumpFallthrough() {
         const char * code = "void f(int n) {\n"
                             "    void g(), h(), i();\n"