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

Fixed #1671 (simplifyTypedef: support for more typedefs)

This commit is contained in:
Robert Reif 2010-05-11 21:41:33 +02:00 committed by Daniel Marjamäki
parent d0ca73c193
commit 963108d957
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/tokenize.cpp
View File

@ -732,6 +732,7 @@ void Tokenizer::simplifyTypedef()
bool function = false; bool function = false;
bool functionPtr = false; bool functionPtr = false;
bool functionRef = false; bool functionRef = false;
Token *functionNamespace = 0;
if (Token::Match(tok->next(), "::") || if (Token::Match(tok->next(), "::") ||
Token::Match(tok->next(), "%type%")) Token::Match(tok->next(), "%type%"))
@ -794,6 +795,9 @@ void Tokenizer::simplifyTypedef()
return; return;
} }
while (Token::Match(typeEnd->next(), "const|volatile"))
typeEnd = typeEnd->next();
tok = typeEnd; tok = typeEnd;
offset = 1; offset = 1;
} }
@ -878,6 +882,27 @@ void Tokenizer::simplifyTypedef()
continue; continue;
} }
} }
else if (tok->tokAt(offset) && Token::Match(tok->tokAt(offset), "( %var% :: *|&| %type% ) ("))
{
functionNamespace = tok->tokAt(offset + 1);
functionPtr = tok->tokAt(offset + 3)->str() == "*";
functionRef = tok->tokAt(offset + 3)->str() == "&";
function = tok->tokAt(offset + 4)->str() == ")";
if (!function)
offset++;
if (tok->tokAt(offset + 5)->link()->next())
{
typeName = tok->tokAt(offset + 3);
argStart = tok->tokAt(offset + 5);
argEnd = tok->tokAt(offset + 5)->link();
tok = argEnd->next();
}
else
{
// internal error
continue;
}
}
else if (tok->tokAt(offset) && Token::Match(tok->tokAt(offset), "( %type% (")) else if (tok->tokAt(offset) && Token::Match(tok->tokAt(offset), "( %type% ("))
{ {
function = true; function = true;
@ -1051,6 +1076,13 @@ void Tokenizer::simplifyTypedef()
tok2->insertToken("("); tok2->insertToken("(");
tok2 = tok2->next(); tok2 = tok2->next();
Token *tok3 = tok2; Token *tok3 = tok2;
if (functionNamespace)
{
tok2->insertToken(functionNamespace->str());
tok2 = tok2->next();
tok2->insertToken("::");
tok2 = tok2->next();
}
if (functionPtr) if (functionPtr)
tok2->insertToken("*"); tok2->insertToken("*");
else if (functionRef) else if (functionRef)

24
test/testsimplifytokens.cpp
View File

@ -185,6 +185,7 @@ private:
TEST_CASE(simplifyTypedef44); TEST_CASE(simplifyTypedef44);
TEST_CASE(simplifyTypedef45); // ticket #1613 TEST_CASE(simplifyTypedef45); // ticket #1613
TEST_CASE(simplifyTypedef46); // ticket #1615 TEST_CASE(simplifyTypedef46); // ticket #1615
TEST_CASE(simplifyTypedef47);
TEST_CASE(simplifyTypedefFunction); TEST_CASE(simplifyTypedefFunction);
@ -3911,6 +3912,29 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void simplifyTypedef47()
{
{
const char code[] = "typedef std::pair<int, int> const I;\n"
"I i;";
// The expected result..
const std::string expected("; "
"std :: pair < int , int > const i ;");
ASSERT_EQUALS(expected, sizeof_(code));
}
{
const char code[] = "typedef void (X:: *F)();\n"
"F f;";
// The expected result..
const std::string expected("; "
"void ( X :: * f ) ( ) ;");
ASSERT_EQUALS(expected, sizeof_(code));
}
}
void simplifyTypedefFunction() void simplifyTypedefFunction()
{ {
{ {