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

template simplifier: fix location of forward declaration for explicit specializations (#1550)

This commit is contained in:
IOBYTE 2018-12-31 11:19:34 -05:00 committed by Daniel Marjamäki
parent 141ce7cd63
commit 9dc8faa3b6
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/templatesimplifier.cpp
View File

@ -1891,12 +1891,8 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
}
// process uninstantiated templates
const std::list<TokenAndName>::iterator it = std::find_if(mTemplateInstantiations.begin(),
mTemplateInstantiations.end(),
FindName(templateDeclaration.name));
// TODO: remove the specialized check and handle all uninstantiated templates someday.
if (it == mTemplateInstantiations.end() && specialized) {
if (!instantiated && specialized) {
simplifyCalculations(templateDeclaration.token);
Token * tok2 = const_cast<Token *>(templateDeclaration.nameToken);

32
test/testsimplifytemplate.cpp
View File

@ -508,9 +508,9 @@ private:
"}\n";
// The expected result..
const char expected[] = "void a<2> ( ) ; "
const char expected[] = "void a<0> ( ) ; "
"void a<2> ( ) ; "
"void a<1> ( ) ; "
"void a<0> ( ) ; "
"void a<0> ( ) { } "
"int main ( ) "
"{ a<2> ( ) ; return 0 ; } "
@ -1721,26 +1721,16 @@ private:
"template <> void Fred::foo<bool>() { }\n"
"template <> void Fred::foo<int>() { }";
const char exp[] = "struct Fred { "
"static void foo<char> ( ) ; "
"static void foo<float> ( ) ; "
"static void foo<bool> ( ) ; "
"static void foo<int> ( ) ; "
"} ; "
"void Fred :: foo<char> ( ) { } "
"void Fred :: foo<float> ( ) { } "
"void Fred :: foo<bool> ( ) { } "
"void Fred :: foo<int> ( ) { }";
const char act[] = "struct Fred { "
"static void foo<bool> ( ) ; "
"static void foo<char> ( ) ; "
"static void foo<float> ( ) ; "
"} ; "
"void Fred :: foo<bool> ( ) ; "
"void Fred :: foo<bool> ( ) { } "
"void Fred :: foo<int> ( ) ; "
"void Fred :: foo<int> ( ) { } "
"void Fred :: foo<char> ( ) { } "
"void Fred :: foo<float> ( ) { }";
TODO_ASSERT_EQUALS(exp, act, tok(code));
ASSERT_EQUALS(exp, tok(code));
}
void template90() { // crash
@ -1763,11 +1753,11 @@ private:
"template<> int foo<int>(int a) { return a; }\n"
"template float foo<float>(float);\n"
"template double foo<double>(double);";
const char exp[] = "float foo<float> ( float t ) ; "
"double foo<double> ( double t ) ; "
const char exp[] = "int foo<int> ( int a ) ; "
"char foo<char> ( char a ) ; "
"float foo<float> ( float t ) ; "
"double foo<double> ( double t ) ; "
"char foo<char> ( char a ) { return a ; } "
"int foo<int> ( int a ) ; "
"int foo<int> ( int a ) { return a ; } "
"float foo<float> ( float t ) { return t ; } "
"double foo<double> ( double t ) { return t ; }";
@ -1782,11 +1772,11 @@ private:
"template float Fred::foo<float>(float);\n"
"template double Fred::foo<double>(double);";
const char exp[] = "struct Fred { "
"int foo<int> ( int a ) ; "
"char foo<char> ( char a ) ; "
"float foo<float> ( float t ) ; "
"double foo<double> ( double t ) ; "
"char foo<char> ( char a ) ; "
"char foo<char> ( char a ) { return a ; } "
"int foo<int> ( int a ) ; "
"int foo<int> ( int a ) { return a ; } "
"} ; "
"float Fred :: foo<float> ( float t ) { return t ; } "
@ -1805,11 +1795,11 @@ private:
"template double NS1::NS2::foo<double>(double);";
const char exp[] = "namespace NS1 { "
"namespace NS2 { "
"int foo<int> ( int a ) ; "
"char foo<char> ( char a ) ; "
"float foo<float> ( float t ) ; "
"double foo<double> ( double t ) ; "
"char foo<char> ( char a ) ; "
"char foo<char> ( char a ) { return a ; } "
"int foo<int> ( int a ) ; "
"int foo<int> ( int a ) { return a ; } "
"} "
"} "