From c42facae1f68cfb8fea782e07d9af533c325776e Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Fri, 12 Oct 2012 17:08:21 +0200
Subject: [PATCH] Tokenizer::simplifyLabelsCaseDefault: jump '(' and '['
 parenthesis. TestTokenizer: add simple test cases with some correct and wrong
 syntax concerning 'case'.

---
 lib/tokenize.cpp      |  3 +++
 test/testtokenize.cpp | 48 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 8bcd51888..e8b6020bc 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -2387,6 +2387,9 @@ bool Tokenizer::simplifyLabelsCaseDefault()
 
         if (Token::Match(tok, "[;{}] case")) {
             while (NULL != (tok = tok->next())) {
+                if (tok->str() == "(" || tok->str() == "[") {
+                    tok = tok->link();
+                }
                 if (Token::Match(tok->next(),"[:{};]"))
                     break;
             }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index a4b8450e6..937727eaf 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -66,7 +66,7 @@ private:
         TEST_CASE(wrong_syntax3); // #3544
         TEST_CASE(wrong_syntax4); // #3618
         TEST_CASE(wrong_syntax_if_macro);  // #2518 - if MACRO()
-        TEST_CASE(wrong_syntax_case_default);
+        TEST_CASE(syntax_case_default);
         TEST_CASE(garbageCode);
 
         TEST_CASE(foreach);     // #3690
@@ -723,14 +723,51 @@ private:
         ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
     }
 
-    void wrong_syntax_case_default() {
+    void syntax_case_default() {
+        //correct syntax
         {
+            tokenizeAndStringify("void f() {switch (n) { case 0: z(); break;}}");
+            ASSERT_EQUALS("", errout.str());
+
+            tokenizeAndStringify("void f() {switch (n) { case 0:; break;}}");
+            ASSERT_EQUALS("", errout.str());
+
+            //'b' can be or a macro or an undefined enum
+            tokenizeAndStringify("void f() {switch (n) { case b: z(); break;}}");
+            ASSERT_EQUALS("", errout.str());
+
+            //valid, when there's this declaration: 'constexpr int g() { return 2; }'
+            tokenizeAndStringify("void f() {switch (n) { case g(): z(); break;}}");
+            ASSERT_EQUALS("", errout.str());
+
+            //valid, when there's also this declaration: 'constexpr int g[1] = {0};'
+            tokenizeAndStringify("void f() {switch (n) { case g[0]: z(); break;}}");
+            ASSERT_EQUALS("", errout.str());
+
+            //valid, similar to above case
+            tokenizeAndStringify("void f() {switch (n) { case *g: z(); break;}}");
+            ASSERT_EQUALS("", errout.str());
+
+            //valid, when 'x' and 'y' are constexpr.
+            tokenizeAndStringify("void f() {switch (n) { case sqrt(x+y): z(); break;}}");
+            ASSERT_EQUALS("", errout.str());
+        }
+
+        //wrong syntax
+        {
+            tokenizeAndStringify("void f() {switch (n) { case: z(); break;}}");
+            ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
+
+            tokenizeAndStringify("void f() {switch (n) { case;: z(); break;}}");
+            ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
+
+            tokenizeAndStringify("void f() {switch (n) { case {}: z(); break;}}");
+            ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
+
             //ticket #4234
             tokenizeAndStringify("( ) { switch break ; { switch ( x ) { case } y break ; : } }");
             ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
-        }
 
-        {
             //ticket #4267
             tokenizeAndStringify("f ( ) { switch break; { switch ( x ) { case } case break; -6: ( ) ; } }");
             ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str());
@@ -5743,9 +5780,6 @@ private:
         //ticket #3227
         ASSERT_EQUALS("void foo ( ) { switch ( n ) { label : ; case 1 : ; label1 : ; label2 : ; break ; } }",
                       tokenizeAndStringify("void foo(){ switch (n){ label: case 1: label1: label2: break; }}"));
-        //ticket #4234
-        ASSERT_EQUALS("( ) { switch break ; { switch ( x ) { case } y break ; : } }",
-                      tokenizeAndStringify("( ) { switch break ; { switch ( x ) { case } y break ; : } }"));
     }
 
     void simplifyPointerToStandardType() {