fix syntax error on template operator (danmar#2225)

IOBYTE · danmar · commit 3e17c24dd864 · 2019-10-03T12:26:45.000+02:00
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -851,6 +851,14 @@ Token* Token::nextTemplateArgument() const
     return nullptr;
 }
 
+static bool isOperator(const Token *tok)
+{
+    if (tok->link())
+        tok = tok->link();
+    // TODO handle multi token operators
+    return tok->strAt(-1) == "operator";
+}
+
 const Token * Token::findClosingBracket() const
 {
     if (mStr != "<")
@@ -869,7 +877,8 @@ const Token * Token::findClosingBracket() const
         } else if (Token::Match(closing, "}|]|)|;"))
             return nullptr;
         // we can make some guesses for template parameters
-        else if (closing->str() == "<" && closing->previous() && closing->previous()->isName() &&
+        else if (closing->str() == "<" && closing->previous() &&
+                 (closing->previous()->isName() || isOperator(closing->previous())) &&
                  (templateParameter ? templateParameters.find(closing->strAt(-1)) == templateParameters.end() : true))
             ++depth;
         else if (closing->str() == ">") {
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -6644,11 +6644,12 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
                         while (tok2 && tok2->str() != "," && tok2->str() != ";") {
                             if (Token::Match(tok2, "{|(|["))
                                 tok2 = tok2->link();
+                            const Token *tok3 = tok2;
                             if (!isC() && tok2->str() == "<" && TemplateSimplifier::templateParameters(tok2) > 0) {
                                 tok2 = tok2->findClosingBracket();
                             }
                             if (!tok2)
-                                syntaxError(nullptr); // #6881 invalid code
+                                syntaxError(tok3); // #6881 invalid code
                             tok2 = tok2->next();
                         }
                         if (tok2 && tok2->str() == ";")
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -187,6 +187,7 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(template147); // syntax error
         TEST_CASE(template148); // syntax error
         TEST_CASE(template149); // unknown macro
+        TEST_CASE(template150); // syntax error
         TEST_CASE(template_specialization_1);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_2);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_enum);  // #6299 Syntax error in complex enum declaration (including template)
@@ -3551,6 +3552,25 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_THROW_EQUALS(tok(code), InternalError, "There is an unknown macro here somewhere. Configuration is required. If BEGIN_VERSIONED_NAMESPACE_DECL is a macro then please configure it.");
     }
 
+    void template150() { // syntax error
+        const char code[] = "struct Test {\n"
+                            "  template <typename T>\n"
+                            "  T &operator[] (T) {}\n"
+                            "};\n"
+                            "void foo() {\n"
+                            "  Test test;\n"
+                            "  const string type = test.operator[]<string>(\"type\");\n"
+                            "}";
+        const char exp[] = "struct Test { "
+                           "string & operator[]<string> ( string ) ; "
+                           "} ; "
+                           "void foo ( ) { "
+                           "Test test ; "
+                           "const string type = test . operator[]<string> ( \"type\" ) ; "
+                           "} string & Test :: operator[]<string> ( string ) { }";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
     void template_specialization_1() {  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         const char code[] = "template <typename T> struct C {};\n"
                             "template <typename T> struct S {a};\n"

Original file line number	Diff line number	Diff line change
`@@ -6644,11 +6644,12 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co`
`6644`	`6644`	`while (tok2 && tok2->str() != "," && tok2->str() != ";") {`
`6645`	`6645`	`if (Token::Match(tok2, "{\|(\|["))`
`6646`	`6646`	`tok2 = tok2->link();`
	`6647`	`+ const Token *tok3 = tok2;`
`6647`	`6648`	`if (!isC() && tok2->str() == "<" && TemplateSimplifier::templateParameters(tok2) > 0) {`
`6648`	`6649`	`tok2 = tok2->findClosingBracket();`
`6649`	`6650`	`}`
`6650`	`6651`	`if (!tok2)`
`6651`		`- syntaxError(nullptr); // #6881 invalid code`
	`6652`	`+ syntaxError(tok3); // #6881 invalid code`
`6652`	`6653`	`tok2 = tok2->next();`
`6653`	`6654`	`}`
`6654`	`6655`	`if (tok2 && tok2->str() == ";")`