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

Fixed 1329 (simplify typedef of function pointer returning template)

This commit is contained in:
Robert Reif 2010-01-30 08:00:11 +01:00 committed by Daniel Marjamäki
parent f9d5fb3191
commit 882e2225e0
2 changed files with 61 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lib/tokenize.cpp
View File

@ -443,19 +443,18 @@ void Tokenizer::simplifyTypedef()
tok = tok3;
}
const char *type1 = 0;
const char *type2 = 0;
const char *type3 = 0;
const char *type4 = 0;
const char *typeName = 0;
std::list<std::string> pointers;
Token *start = 0;
Token *end = 0;
Token *typeStart = 0;
Token *typeEnd = 0;
Token *argStart = 0;
Token *argEnd = 0;
Token *num = 0;
Token *typeDef = tok;
int offset = 1;
bool functionPtr = false;
bool functionRef = false;
bool hasTemplate = false;
if (Token::Match(tok->next(), "%type% <") ||
Token::Match(tok->next(), "%type% %type% <") ||
@ -463,22 +462,23 @@ void Tokenizer::simplifyTypedef()
Token::Match(tok->next(), "%type% %type% :: %type% <"))
{
// template
hasTemplate = true;
int level = 1;
start = tok->next();
typeStart = tok->next();
if (tok->tokAt(2)->str() == "<")
end = tok->tokAt(3);
typeEnd = tok->tokAt(3);
else if (tok->tokAt(3)->str() == "<")
end = tok->tokAt(4);
typeEnd = tok->tokAt(4);
else if (tok->tokAt(4)->str() == "<")
end = tok->tokAt(5);
typeEnd = tok->tokAt(5);
else
end = tok->tokAt(6);
typeEnd = tok->tokAt(6);
int paren = 0;
for (; end ; end = end->next())
for (; typeEnd ; typeEnd = typeEnd->next())
{
if (end->str() == ">")
if (typeEnd->str() == ">")
{
if (paren == 0)
{
@ -487,51 +487,53 @@ void Tokenizer::simplifyTypedef()
break;
}
}
else if (end->str() == "<")
else if (typeEnd->str() == "<")
{
if (paren == 0)
level++;
}
else if (end->str() == "(")
else if (typeEnd->str() == "(")
paren++;
else if (end->str() == ")")
else if (typeEnd->str() == ")")
paren--;
}
while (end && end->next() && Token::Match(end->next(), ":: %type%"))
end = end->tokAt(2);
while (typeEnd && typeEnd->next() && Token::Match(typeEnd->next(), ":: %type%"))
typeEnd = typeEnd->tokAt(2);
if (!end)
if (!typeEnd)
{
// internal error
return;
}
tok = end;
tok = typeEnd;
}
else if (Token::Match(tok->next(), "%type%"))
{
type1 = tok->strAt(offset++);
typeStart = tok->next();
typeEnd = tok->tokAt(offset++);
if (tok->tokAt(offset) && Token::Match(tok->tokAt(offset), "%type%") &&
tok->tokAt(offset + 1) && !Token::Match(tok->tokAt(offset + 1), "[|;|,"))
{
type2 = tok->strAt(offset++);
typeEnd = tok->tokAt(offset++);
if (tok->tokAt(offset) && Token::Match(tok->tokAt(offset), "::"))
{
type3 = tok->strAt(offset++);
typeEnd = tok->tokAt(offset++);
if (tok->tokAt(offset) && Token::Match(tok->tokAt(offset), "%type%") &&
tok->tokAt(offset + 1) && !Token::Match(tok->tokAt(offset + 1), "[|;|,"))
{
type4 = tok->strAt(offset++);
typeEnd = tok->tokAt(offset++);
}
}
else if (tok->tokAt(offset) && Token::Match(tok->tokAt(offset), "%type%") &&
tok->tokAt(offset + 1) && !Token::Match(tok->tokAt(offset + 1), "[|;|,"))
{
type3 = tok->strAt(offset++);
typeEnd = tok->tokAt(offset++);
}
}
}
@ -569,9 +571,9 @@ void Tokenizer::simplifyTypedef()
functionPtr = tok->tokAt(offset + 1)->str() == "*";
functionRef = tok->tokAt(offset + 1)->str() == "&";
typeName = tok->strAt(offset + 2);
start = tok->tokAt(offset + 4);
end = tok->tokAt(offset + 4)->link();
tok = end->next();
argStart = tok->tokAt(offset + 4);
argEnd = tok->tokAt(offset + 4)->link();
tok = argEnd->next();
}
else
{
@ -629,9 +631,9 @@ void Tokenizer::simplifyTypedef()
Token::Match(tok2->tokAt(-3), "!!typedef"))
{
// Check for enum and typedef with same name.
if (type1 && (tok2->tokAt(-1)->str() != type1))
if (!hasTemplate && tok2->tokAt(-1)->str() != typeStart->str())
simplifyType = true;
else if (!type1)
else if (hasTemplate)
simplifyType = true;
}
else
@ -651,12 +653,10 @@ void Tokenizer::simplifyTypedef()
Token::Match(tok2->next(), "> (")))
inCast = true;
if (start && end && !(functionPtr || functionRef))
{
tok2->str(start->str());
tok2->str(typeStart->str());
Token * nextToken;
std::stack<Token *> links;
for (nextToken = start->next(); nextToken != end->next(); nextToken = nextToken->next())
for (nextToken = typeStart->next(); nextToken != typeEnd->next(); nextToken = nextToken->next())
{
tok2->insertToken(nextToken->strAt(0));
tok2 = tok2->next();
@ -674,26 +674,6 @@ void Tokenizer::simplifyTypedef()
links.pop();
}
}
}
else
{
tok2->str(type1);
if (type2)
{
tok2->insertToken(type2);
tok2 = tok2->next();
}
if (type3)
{
tok2->insertToken(type3);
tok2 = tok2->next();
}
if (type4)
{
tok2->insertToken(type4);
tok2 = tok2->next();
}
}
while (!pointers.empty())
{
@ -748,7 +728,7 @@ void Tokenizer::simplifyTypedef()
tok3 = tok2;
Token * nextToken;
std::stack<Token *> links;
for (nextToken = start->next(); nextToken != end; nextToken = nextToken->next())
for (nextToken = argStart->next(); nextToken != argEnd; nextToken = nextToken->next())
{
tok2->insertToken(nextToken->strAt(0));
tok2 = tok2->next();

13
test/testsimplifytokens.cpp
View File

@ -164,6 +164,7 @@ private:
TEST_CASE(simplifyTypedef25);
TEST_CASE(simplifyTypedef26);
TEST_CASE(simplifyTypedef27);
TEST_CASE(simplifyTypedef28);
TEST_CASE(reverseArraySyntax)
TEST_CASE(simplify_numeric_condition)
@ -2954,6 +2955,18 @@ private:
ASSERT_EQUALS(expected, tok(code, false));
}
void simplifyTypedef28()
{
const char code[] = "typedef std::pair<double, double> (*F)(double);\n"
"F f;";
const char expected[] =
"; "
"std :: pair < double , double > ( * f ) ( double ) ;";
ASSERT_EQUALS(expected, tok(code, false));
}
void reverseArraySyntax()
{
ASSERT_EQUALS("a [ 13 ]", tok("13[a]"));