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

typedef: Fixed testcase. ticket: #2375

This commit is contained in:
Daniel Marjamäki 2011-01-02 17:28:47 +01:00
parent 97f7a36e91
commit d2714fefda
2 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/tokenize.cpp
View File

@ -1126,12 +1126,23 @@ void Tokenizer::simplifyTypedef()
bool exitThisScope = false; bool exitThisScope = false;
int exitScope = 0; int exitScope = 0;
bool simplifyType = false; bool simplifyType = false;
bool inMemberFunc = false;
int memberScope = 0;
std::size_t classLevel = spaceInfo.size(); std::size_t classLevel = spaceInfo.size();
for (Token *tok2 = tok; tok2; tok2 = tok2->next()) for (Token *tok2 = tok; tok2; tok2 = tok2->next())
{ {
// check for end of scope
if (tok2->str() == "}") if (tok2->str() == "}")
{ {
// check for end of member function
if (inMemberFunc)
{
memberScope--;
if (memberScope == 0)
inMemberFunc = false;
}
if (classLevel > 0 && tok2 == spaceInfo[classLevel - 1].classEnd) if (classLevel > 0 && tok2 == spaceInfo[classLevel - 1].classEnd)
{ {
--classLevel; --classLevel;
@ -1155,13 +1166,52 @@ void Tokenizer::simplifyTypedef()
} }
} }
} }
// check for member functions
else if (Token::Match(tok2, ") const| {"))
{
const Token *func = tok2->link()->previous();
/** @todo add support for multi-token operators */
if (func->previous()->str() == "operator")
func = func->previous();
// check for qualifier
if (func->previous()->str() == "::")
{
// check for available and matching class name
if (!spaceInfo.empty() &&
func->strAt(-2) == spaceInfo[classLevel].className)
{
memberScope = 0;
inMemberFunc = true;
}
}
}
// check for entering a new scope
else if (tok2->str() == "{") else if (tok2->str() == "{")
{ {
// keep track of scopes within member function
if (inMemberFunc)
memberScope++;
scope++; scope++;
} }
else if (Token::Match(tok2, pattern.c_str()))
// check for typedef that can be substituted
else if (Token::Match(tok2, pattern.c_str()) ||
(inMemberFunc && tok2->str() == typeName->str()))
{ {
if (pattern != typeName->str()) // has a "something ::" std::string pattern1;
// member function class variables don't need qualification
if (inMemberFunc && tok2->str() == typeName->str())
pattern1 = tok2->str();
else
pattern1 = pattern;
if (pattern1.find("::") != std::string::npos) // has a "something ::"
{ {
for (std::size_t i = classLevel; i < spaceInfo.size(); i++) for (std::size_t i = classLevel; i < spaceInfo.size(); i++)
{ {
@ -1170,7 +1220,7 @@ void Tokenizer::simplifyTypedef()
} }
simplifyType = true; simplifyType = true;
} }
else if (inScope && !exitThisScope) else if ((inScope && !exitThisScope) || inMemberFunc)
{ {
if (Token::simpleMatch(tok2->previous(), "::")) if (Token::simpleMatch(tok2->previous(), "::"))
{ {

8
test/testsimplifytokens.cpp
View File

@ -4730,13 +4730,13 @@ private:
" typedef int INT;\n" " typedef int INT;\n"
" void f1() const;\n" " void f1() const;\n"
"};\n" "};\n"
"void Fred::f1() const { INT i; }\n"; "void Fred::f1() const { INT i; f(i); }\n";
const std::string expected = "class Fred { " const std::string expected = "class Fred { "
"; " "; "
"void f1 ( ) const ; " "void f1 ( ) const ; "
"} ; " "} ; "
"void Fred :: f1 ( ) const { int i ; }"; "void Fred :: f1 ( ) const { int i ; f ( i ) ; }";
TODO_ASSERT_EQUALS(expected, sizeof_(code)); ASSERT_EQUALS(expected, sizeof_(code));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
// out of line operator // out of line operator
@ -4750,7 +4750,7 @@ private:
"; " "; "
"operator int * * ( ) const ; " "operator int * * ( ) const ; "
"} ; " "} ; "
"Fred :: operator int * * ( ) const { } "; "Fred :: operator int * * ( ) const { }";
TODO_ASSERT_EQUALS(expected, sizeof_(code)); TODO_ASSERT_EQUALS(expected, sizeof_(code));
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }