walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix #9246 (Syntax error on C++ code) (#2061)

This commit is contained in:
IOBYTE 2019-08-03 02:15:06 -04:00 committed by Daniel Marjamäki
parent f02636e995
commit 2da83df37b
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/templatesimplifier.cpp
View File

@ -1221,7 +1221,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
break; break;
} }
} }
if (!tok2 || tok2->str() != ">" || args.size() != aliasParameters.size()) { if (!tok2 || tok2->str() != ">" || (!aliasDeclaration.isVariadic() && (args.size() != aliasParameters.size()))) {
++it2; ++it2;
continue; continue;
} }
@ -1597,6 +1597,10 @@ void TemplateSimplifier::expandTemplate(
++typeindentlevel; ++typeindentlevel;
else if (typeindentlevel > 0 && typetok->str() == ">") else if (typeindentlevel > 0 && typetok->str() == ">")
--typeindentlevel; --typeindentlevel;
else if (typetok->str() == "(")
++typeindentlevel;
else if (typetok->str() == ")")
--typeindentlevel;
dst->insertToken(typetok->str(), typetok->originalName(), true); dst->insertToken(typetok->str(), typetok->originalName(), true);
Token *previous = dst->previous(); Token *previous = dst->previous();
previous->isTemplateArg(true); previous->isTemplateArg(true);
@ -1818,6 +1822,10 @@ void TemplateSimplifier::expandTemplate(
++typeindentlevel; ++typeindentlevel;
else if (typeindentlevel > 0 && typetok->str() == ">") else if (typeindentlevel > 0 && typetok->str() == ">")
--typeindentlevel; --typeindentlevel;
else if (typetok->str() == "(")
++typeindentlevel;
else if (typetok->str() == ")")
--typeindentlevel;
mTokenList.addtoken(typetok, tok5->linenr(), tok5->fileIndex()); mTokenList.addtoken(typetok, tok5->linenr(), tok5->fileIndex());
Token *back = mTokenList.back(); Token *back = mTokenList.back();
if (Token::Match(back, "{|(|[")) { if (Token::Match(back, "{|(|[")) {
@ -1918,6 +1926,10 @@ void TemplateSimplifier::expandTemplate(
++typeindentlevel; ++typeindentlevel;
else if (typeindentlevel > 0 && typetok->str() == ">") else if (typeindentlevel > 0 && typetok->str() == ">")
--typeindentlevel; --typeindentlevel;
else if (typetok->str() == "(")
++typeindentlevel;
else if (typetok->str() == ")")
--typeindentlevel;
if (copy) { if (copy) {
mTokenList.addtoken(typetok, tok3->linenr(), tok3->fileIndex()); mTokenList.addtoken(typetok, tok3->linenr(), tok3->fileIndex());
Token *back = mTokenList.back(); Token *back = mTokenList.back();
@ -2992,6 +3004,10 @@ void TemplateSimplifier::replaceTemplateUsage(
while (tok2 != endToken && (indentlevel2 > 0 || tok2->str() != ">")) { while (tok2 != endToken && (indentlevel2 > 0 || tok2->str() != ">")) {
if (tok2->str() == "<" && (tok2->strAt(1) == ">" || templateParameters(tok2))) if (tok2->str() == "<" && (tok2->strAt(1) == ">" || templateParameters(tok2)))
++indentlevel2; ++indentlevel2;
else if (tok2->str() == "(")
++indentlevel2;
else if (tok2->str() == ")")
--indentlevel2;
else if (indentlevel2 > 0 && Token::Match(tok2, "> [,>]")) else if (indentlevel2 > 0 && Token::Match(tok2, "> [,>]"))
--indentlevel2; --indentlevel2;
else if (indentlevel2 == 0) { else if (indentlevel2 == 0) {

14
test/testsimplifytemplate.cpp
View File

@ -167,6 +167,7 @@ private:
TEST_CASE(template127); // #9225 TEST_CASE(template127); // #9225
TEST_CASE(template128); // #9224 TEST_CASE(template128); // #9224
TEST_CASE(template129); TEST_CASE(template129);
TEST_CASE(template130); // #9246
TEST_CASE(template_specialization_1); // #7868 - template specialization template <typename T> struct S<C<T>> {..}; 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_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) TEST_CASE(template_enum); // #6299 Syntax error in complex enum declaration (including template)
@ -3087,6 +3088,19 @@ private:
ASSERT_EQUALS(exp, tok(code)); ASSERT_EQUALS(exp, tok(code));
} }
void template130() { // #9246
const char code[] = "template <typename...> using a = int;\n"
"template <typename, typename> using b = a<>;\n"
"template <typename, typename> void c();\n"
"template <typename d, typename> void e() { c<b<d, int>, int>; }\n"
"void f() { e<int(int, ...), int>(); }";
const char exp[] = "template < typename , typename > void c ( ) ; "
"void e<int(int,...),int> ( ) ; "
"void f ( ) { e<int(int,...),int> ( ) ; } "
"void e<int(int,...),int> ( ) { c < int , int > ; }";
ASSERT_EQUALS(exp, tok(code));
}
void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..}; void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..};
const char code[] = "template <typename T> struct C {};\n" const char code[] = "template <typename T> struct C {};\n"
"template <typename T> struct S {a};\n" "template <typename T> struct S {a};\n"