Added unit test and resolved issue with the symbol database not recognizing member functions if preceded by a macro that does not require a semicolon.

stbrowne · stbrowne · commit 486cc91627ed · 2017-05-01T21:30:26.000-04:00
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1581,7 +1581,7 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
             }
 
             // should be at a sequence point if this is a function
-            if (!Token::Match(tok1, ">|{|}|;|public:|protected:|private:") && tok1)
+            if (!Token::Match(tok1, ">|{|}|;|)|public:|protected:|private:") && tok1)
                 return false;
         }
 
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -331,6 +331,9 @@ class TestSymbolDatabase: public TestFixture {
         TEST_CASE(auto7);
         TEST_CASE(auto8);
         TEST_CASE(auto9); // #8044 (segmentation fault)
+
+        TEST_CASE(macroFuncionTest1);
+        TEST_CASE(macroFuncionTest2);
     }
 
     void array() {
@@ -5185,6 +5188,42 @@ class TestSymbolDatabase: public TestFixture {
         ASSERT_EQUALS(true,  db != nullptr); // not null
     }
 
+    void macroFuncionTest1() {
+        GET_SYMBOL_DB("class MacroTest\n {"
+            "public:\n"
+            "    SOME_MACRO_WITH_NO_SEMICOLON()\n"
+            "    void Init() { }\n"
+            "};\n");
+
+        // 3 scopes: Global, Class, and Function
+        ASSERT(db && db->scopeList.size() == 3);
+
+        if (!db)
+            return;
+
+        const Scope *scope = db->findScopeByName("MacroTest");
+        ASSERT(scope && scope->functionList.size() == 1);
+        ASSERT(findFunctionByName("Init", scope) != NULL);
+    }
+
+    void macroFuncionTest2() {
+        GET_SYMBOL_DB("class MacroTest\n {"
+            "public:\n"
+            "    SOME_MACRO_WITH_NO_SEMICOLON(1, 2, 3)\n"
+            "    void Init() { }\n"
+            "};\n");
+
+        // 3 scopes: Global, Class, and Function
+        ASSERT(db && db->scopeList.size() == 3);
+
+        if (!db)
+            return;
+
+        const Scope *scope = db->findScopeByName("MacroTest");
+        ASSERT(scope && scope->functionList.size() == 1);
+        ASSERT(findFunctionByName("Init", scope) != NULL);
+    }
+
 };
 
 REGISTER_TEST(TestSymbolDatabase)

Original file line number	Diff line number	Diff line change
`@@ -1581,7 +1581,7 @@ bool SymbolDatabase::isFunction(const Token tok, const Scope outerScope, const`
`1581`	`1581`	`}`
`1582`	`1582`
`1583`	`1583`	`// should be at a sequence point if this is a function`
`1584`		`- if (!Token::Match(tok1, ">\|{\|}\|;\|public:\|protected:\|private:") && tok1)`
	`1584`	`+ if (!Token::Match(tok1, ">\|{\|}\|;\|)\|public:\|protected:\|private:") && tok1)`
`1585`	`1585`	`return false;`
`1586`	`1586`	`}`
`1587`	`1587`