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

expanding template classes

This commit is contained in:
Daniel Marjamäki 2009-03-12 22:17:42 +01:00
parent f96e2deb1a
commit 4c28882a12
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tokenize.cpp
View File

@ -486,15 +486,18 @@ void Tokenizer::tokenize(std::istream &code, const char FileName[])
// Handle templates.. // Handle templates..
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
{ {
if (!Token::Match(tok, "template < %type% %var% > %type% %var% (")) if (!Token::Match(tok, "template < %type% %var% > %type% %var% (") &&
!Token::Match(tok, "template < %type% %var% > class %var% {"))
continue; continue;
// type and function name.. // type and function name..
const std::string type(tok->strAt(3)); const std::string type(tok->strAt(3));
const std::string funcname(tok->strAt(6)); const std::string name(tok->strAt(6));
const bool isfunc(tok->strAt(7)[0] == '(');
// locate template usage.. // locate template usage..
const std::string pattern(funcname + " < %type% > ("); const std::string pattern(name + " < %type% > " + (isfunc ? "(" : "%var%"));
for (Token *tok2 = _tokens; tok2; tok2 = tok2->next()) for (Token *tok2 = _tokens; tok2; tok2 = tok2->next())
{ {
if (!Token::Match(tok2, pattern.c_str())) if (!Token::Match(tok2, pattern.c_str()))
@ -503,13 +506,13 @@ void Tokenizer::tokenize(std::istream &code, const char FileName[])
// New type.. // New type..
const std::string type2(tok2->strAt(2)); const std::string type2(tok2->strAt(2));
// New funcname.. // New classname/funcname..
const std::string funcname2(funcname + "<" + type2 + ">"); const std::string name2(name + "<" + type2 + ">");
// Create copy of template.. // Create copy of template..
const Token *tok3 = tok->tokAt(5); const Token *tok3 = tok->tokAt(5);
addtoken(((tok3->str() == type) ? type2 : tok3->str()).c_str(), tok3->linenr(), tok3->fileIndex()); addtoken(((tok3->str() == type) ? type2 : tok3->str()).c_str(), tok3->linenr(), tok3->fileIndex());
addtoken(funcname2.c_str(), tok3->linenr(), tok3->fileIndex()); addtoken(name2.c_str(), tok3->linenr(), tok3->fileIndex());
int indentlevel = 0; int indentlevel = 0;
for (tok3 = tok3->tokAt(2); tok3; tok3 = tok3->next()) for (tok3 = tok3->tokAt(2); tok3; tok3 = tok3->next())
{ {
@ -529,9 +532,9 @@ void Tokenizer::tokenize(std::istream &code, const char FileName[])
// Replace all these template usages.. // Replace all these template usages..
for (Token *tok4 = tok2; tok4; tok4 = tok4->next()) for (Token *tok4 = tok2; tok4; tok4 = tok4->next())
{ {
if (Token::simpleMatch(tok4, (funcname + " < " + type2 + " >").c_str())) if (Token::simpleMatch(tok4, (name + " < " + type2 + " >").c_str()))
{ {
tok4->str(funcname2.c_str()); tok4->str(name2.c_str());
tok4->deleteNext(); tok4->deleteNext();
tok4->deleteNext(); tok4->deleteNext();
tok4->deleteNext(); tok4->deleteNext();

14
test/testsimplifytokens.cpp
View File

@ -78,6 +78,7 @@ private:
TEST_CASE(casting); TEST_CASE(casting);
TEST_CASE(template1); TEST_CASE(template1);
TEST_CASE(template2);
} }
std::string tok(const char code[]) std::string tok(const char code[])
@ -463,6 +464,19 @@ private:
ASSERT_EQUALS(expected, sizeof_(code)); ASSERT_EQUALS(expected, sizeof_(code));
} }
void template2()
{
const char code[] = "template <classname T> class Fred { T a; };\n"
"Fred<int> fred;";
const std::string expected(" "
"template < classname T > class Fred { T a ; } ; "
"Fred<int> fred ; "
"class Fred<int> { int a ; }");
ASSERT_EQUALS(expected, sizeof_(code));
}
}; };
REGISTER_TEST(TestSimplifyTokens) REGISTER_TEST(TestSimplifyTokens)