Fix 9518 (Syntax error on valid C++) (cppcheck-opensource#2424)

IOBYTE · danmar · commit 5979eec2c07e · 2019-12-05T20:51:36.000+01:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1811,7 +1811,7 @@ namespace {
             return false;
         }
 
-        if (Token::Match(tok1->tokAt(-1), "class|struct|union|enum")) {
+        if (Token::Match(tok1->tokAt(-1), "class|struct|union|enum|namespace")) {
             // fixme
             return false;
         }
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
@@ -68,6 +68,7 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing9381);
         TEST_CASE(simplifyUsing9385);
         TEST_CASE(simplifyUsing9388);
+        TEST_CASE(simplifyUsing9518);
     }
 
     std::string tok(const char code[], bool simplify = true, Settings::PlatformType type = Settings::Native, bool debugwarnings = true) {
@@ -619,6 +620,16 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS(exp, tok(code, false));
     }
 
+    void simplifyUsing9518() {
+        const char code[] = "namespace a {\n"
+                            "using a = enum {};\n"
+                            "}";
+        const char exp[] = "namespace a { "
+                           "enum a { } ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code, false));
+    }
+
 };
 
 REGISTER_TEST(TestSimplifyUsing)

Original file line number	Diff line number	Diff line change
`@@ -1811,7 +1811,7 @@ namespace {`
`1811`	`1811`	`return false;`
`1812`	`1812`	`}`
`1813`	`1813`
`1814`		`- if (Token::Match(tok1->tokAt(-1), "class\|struct\|union\|enum")) {`
	`1814`	`+ if (Token::Match(tok1->tokAt(-1), "class\|struct\|union\|enum\|namespace")) {`
`1815`	`1815`	`// fixme`
`1816`	`1816`	`return false;`
`1817`	`1817`	`}`