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

Try to fix Travis

This commit is contained in:
Daniel Marjamäki 2017-12-23 15:41:32 +01:00
parent 91839c2534
commit 2d7fedbb49
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/templatesimplifier.cpp
View File

@ -832,6 +832,9 @@ void TemplateSimplifier::expandTemplate(
int indentlevel = 0;
std::stack<Token *> brackets; // holds "(", "[" and "{" tokens
// FIXME use full name matching somehow
const std::string lastName = (fullName.find(" ") != std::string::npos) ? fullName.substr(fullName.rfind(" ")+1) : fullName;
for (; tok3; tok3 = tok3->next()) {
if (tok3->isName()) {
// search for this token in the type vector
@ -859,8 +862,7 @@ void TemplateSimplifier::expandTemplate(
}
}
// FIXME replace name..
const std::string lastName = (fullName.find(" ") != std::string::npos) ? fullName.substr(fullName.rfind(" ")+1) : fullName;
// replace name..
if (Token::Match(tok3, (lastName + " !!<").c_str())) {
if (Token::Match(tok3->tokAt(-2), "> :: %name% ( )")) {
; // Ticket #7942: Replacing for out-of-line constructors generates invalid syntax
@ -915,6 +917,7 @@ void TemplateSimplifier::expandTemplate(
// the "}" token should only be added if indentlevel is 1 but I add it always intentionally
// if indentlevel ever becomes 0, cppcheck will write:
// ### Error: Invalid number of character {
inTemplateDefinition = false;
break;
}
--indentlevel;

18
test/testsimplifytemplate.cpp
View File

@ -107,6 +107,7 @@ private:
TEST_CASE(template_member_ptr); // Ticket #5786 - crash upon valid code
TEST_CASE(template_namespace_1);
TEST_CASE(template_namespace_2);
TEST_CASE(template_namespace_3);
// Test TemplateSimplifier::templateParameters
TEST_CASE(templateParameters);
@ -1400,6 +1401,23 @@ private:
"struct X :: S < int > { } ;", tok(code));
}
void template_namespace_3() {
const char code[] = "namespace test16 {\n"
" template <class T> struct foo {\n"
" static void *bar();\n"
" };\n"
" void *test() { return foo<int>::bar(); }\n"
"}";
ASSERT_EQUALS("namespace test16 {"
" void * test ( ) {"
" return foo < int > :: bar ( ) ;"
" } "
"} "
"struct test16 :: foo < int > {"
" static void * bar ( ) ; "
"} ;", tok(code));
}
unsigned int templateParameters(const char code[]) {
Tokenizer tokenizer(&settings, this);