Fix #15086 syntaxError for ternary with two inequalities (#8913)

Author: chrchr-github

lib/templatesimplifier.cpp

@@ -394,13 +394,14 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
         return 0;
     if (tok->str() != "<")
         return 0;
-    if (Token::Match(tok->previous(), "%var% <"))
+    if (Token::Match(tok->previous(), "%var%|) <") && !(tok->linkAt(-1) && Token::simpleMatch(tok->linkAt(-1)->tokAt(-1), "operator")))
         return 0;
     tok = tok->next();
     if (!tok || tok->str() == ">")
         return 0;
 
     unsigned int level = 0;
+    unsigned int ternaryLevel = 0;
 
     while (tok) {
         // skip template template
@@ -460,8 +461,16 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
         }
 
         // Skip '=', '?', ':'
-        if (Token::Match(tok, "=|?|:"))
+        if (Token::Match(tok, "=|?|:")) {
+            if (tok->str()[0] == '?')
+                ++ternaryLevel;
+            else if (tok->str()[0] == ':') {
+                if (ternaryLevel == 0)
+                    return 0;
+                --ternaryLevel;
+            }
             tok = tok->next();
+        }
         if (!tok)
             return 0;
 

test/testtokenize.cpp

@@ -240,6 +240,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(vardecl33);
         TEST_CASE(vardecl34);
         TEST_CASE(vardecl35);
+        TEST_CASE(vardecl36);
         TEST_CASE(vardecl_stl_1);
         TEST_CASE(vardecl_stl_2);
         TEST_CASE(vardecl_stl_3);
@@ -3035,6 +3036,38 @@ class TestTokenizer : public TestFixture {
         }
     }
 
+    void vardecl36() {
+        const char code[] = "struct S {\n" // #15086
+                            "    bool f1() const;\n"
+                            "    bool f2() const;\n"
+                            "    int g() const;\n"
+                            "    int x, y;\n"
+                            "};\n"
+                            "bool S::f1() const {\n"
+                            "    const bool b = x ? g() < 0 : 0 > y;\n"
+                            "    return b;\n"
+                            "}\n"
+                            "bool S::f2() const {\n"
+                            "    const bool b = g() < x ? x != y : 0 > y;\n"
+                            "    return b;\n"
+                            "}\n";
+        const char expected[] = "struct S {\n"
+                                "bool f1 ( ) const ;\n"
+                                "bool f2 ( ) const ;\n"
+                                "int g ( ) const ;\n"
+                                "int x ; int y ;\n"
+                                "} ;\n"
+                                "bool S :: f1 ( ) const {\n"
+                                "const bool b = x ? ( g ( ) < 0 ) : 0 > y ;\n"
+                                "return b ;\n"
+                                "}\n"
+                                "bool S :: f2 ( ) const {\n"
+                                "const bool b = g ( ) < x ? x != y : 0 > y ;\n"
+                                "return b ;\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+    }
+
     void volatile_variables() {
         {
             const char code[] = "volatile int a=0;\n"