Fixed danmar#8184 (Syntax error: case outside switch)

danmar · danmar · commit 2e6d78bd08c0 · 2017-09-15T22:37:31.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8207,6 +8207,16 @@ const Token * Tokenizer::findGarbageCode() const
         }
     }
 
+    // case keyword must be inside switch
+    for (const Token *tok = tokens(); tok; tok = tok->next()) {
+        if (Token::simpleMatch(tok, "switch (") && Token::simpleMatch(tok->linkAt(1), ") {"))
+            tok = tok->linkAt(1)->linkAt(1);
+        else if (tok->str() == "(")
+            tok = tok->link();
+        else if (tok->str() == "case")
+            return tok;
+    }
+
     for (const Token *tok = tokens(); tok ; tok = tok->next()) {
         if (!Token::simpleMatch(tok, "for (")) // find for loops
             continue;
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
@@ -224,6 +224,7 @@ class TestGarbage : public TestFixture {
         TEST_CASE(templateSimplifierCrashes);
         TEST_CASE(syntaxErrorFirstToken); // Make sure syntax errors are detected and reported
         TEST_CASE(syntaxErrorLastToken); // Make sure syntax errors are detected and reported
+        TEST_CASE(syntaxErrorCase);
         TEST_CASE(enumTrailingComma);
     }
 
@@ -1482,6 +1483,11 @@ class TestGarbage : public TestFixture {
         // ASSERT_THROW(  , InternalError)
     }
 
+    void syntaxErrorCase() {
+        // case must be inside switch block
+        ASSERT_THROW(checkCode("void f() { switch (a) {}; case 1: }"), InternalError);
+    }
+
     void enumTrailingComma() {
         ASSERT_THROW(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;"), InternalError); // #8079
     }

Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,7 @@ class TestGarbage : public TestFixture {`
`224`	`224`	`TEST_CASE(templateSimplifierCrashes);`
`225`	`225`	`TEST_CASE(syntaxErrorFirstToken); // Make sure syntax errors are detected and reported`
`226`	`226`	`TEST_CASE(syntaxErrorLastToken); // Make sure syntax errors are detected and reported`
	`227`	`+ TEST_CASE(syntaxErrorCase);`
`227`	`228`	`TEST_CASE(enumTrailingComma);`
`228`	`229`	`}`
`229`	`230`
`@@ -1482,6 +1483,11 @@ class TestGarbage : public TestFixture {`
`1482`	`1483`	`// ASSERT_THROW( , InternalError)`
`1483`	`1484`	`}`
`1484`	`1485`
	`1486`	`+ void syntaxErrorCase() {`
	`1487`	`+ // case must be inside switch block`
	`1488`	`+ ASSERT_THROW(checkCode("void f() { switch (a) {}; case 1: }"), InternalError);`
	`1489`	`+ }`
	`1490`	`+`
`1485`	`1491`	`void enumTrailingComma() {`
`1486`	`1492`	`ASSERT_THROW(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;"), InternalError); // #8079`
`1487`	`1493`	`}`