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

9757: skip template parameters when computing scope (#2670) 

The template parameter is confusing simplifyUsing: it does not compute
properly the scope, and we end up replace "type" in "to_string" with
"void", then later "void" is removed and we have an internal error.
This commit is contained in:
Ken-Patrick Lehrmann 2020-06-06 17:51:15 +02:00 committed by GitHub
parent 44ff22f879
commit 99ff04f617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tokenize.cpp
View File

@ -1712,7 +1712,7 @@ namespace {
return; return;
while (tok->str() == "}" && !scopeInfo->empty() && tok == scopeInfo->back().bodyEnd) while (tok->str() == "}" && !scopeInfo->empty() && tok == scopeInfo->back().bodyEnd)
scopeInfo->pop_back(); scopeInfo->pop_back();
if (!Token::Match(tok, "namespace|class|struct|union %name% {|:|::")) { if (!Token::Match(tok, "namespace|class|struct|union %name% {|:|::|<")) {
// check for using namespace // check for using namespace
if (Token::Match(tok, "using namespace %name% ;|::")) { if (Token::Match(tok, "using namespace %name% ;|::")) {
const Token * tok1 = tok->tokAt(2); const Token * tok1 = tok->tokAt(2);
@ -1778,6 +1778,12 @@ namespace {
while (tok && !Token::Match(tok, ";|{")) while (tok && !Token::Match(tok, ";|{"))
tok = tok->next(); tok = tok->next();
} }
// skip template parameters
if (tok && tok->str() == "<") {
tok = tok->findClosingBracket();
if (tok)
tok = tok->next();
}
if (tok && tok->str() == "{") { if (tok && tok->str() == "{") {
scopeInfo->emplace_back(classname,tok->link()); scopeInfo->emplace_back(classname,tok->link());
} }

16
test/testsimplifyusing.cpp
View File

@ -69,6 +69,7 @@ private:
TEST_CASE(simplifyUsing9385); TEST_CASE(simplifyUsing9385);
TEST_CASE(simplifyUsing9388); TEST_CASE(simplifyUsing9388);
TEST_CASE(simplifyUsing9518); TEST_CASE(simplifyUsing9518);
TEST_CASE(simplifyUsing9757);
} }
std::string tok(const char code[], bool simplify = true, Settings::PlatformType type = Settings::Native, bool debugwarnings = true) { std::string tok(const char code[], bool simplify = true, Settings::PlatformType type = Settings::Native, bool debugwarnings = true) {
@ -627,6 +628,21 @@ private:
ASSERT_EQUALS(exp, tok(code, false)); ASSERT_EQUALS(exp, tok(code, false));
} }
void simplifyUsing9757() {
const char code[] = "enum class Type_t { Nil = 0 };\n"
"template<Type_t type> class MappedType { };\n"
"template<> class MappedType<Type_t::Nil> { using type = void; };\n"
"std::string to_string (Example::Type_t type) {\n"
" switch (type) {}\n"
"}";
const char exp[] = "enum class Type_t { Nil = 0 } ; "
"class MappedType<Type_t::Nil> ; "
"template < Type_t type > class MappedType { } ; "
"class MappedType<Type_t::Nil> { } ; "
"std :: string to_string ( Example :: Type_t type ) { "
"switch ( type ) { } }";
ASSERT_EQUALS(exp, tok(code, false));
}
}; };
REGISTER_TEST(TestSimplifyUsing) REGISTER_TEST(TestSimplifyUsing)