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

Tokenizer: Simplify 'foo(void)' to 'foo()'

This commit is contained in:
PKEuS 2011-10-27 19:56:59 +02:00 committed by Daniel Marjamäki
parent 845e5d259a
commit 49fd057e17
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tokenize.cpp
View File

@ -2428,6 +2428,11 @@ bool Tokenizer::tokenize(std::istream &code,
} }
} }
for (Token* tok = _tokens; tok; tok = tok->next()) {
if (Token::Match(tok, "%var% ( void )"))
tok->next()->deleteNext();
}
return validate(); return validate();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -3280,7 +3285,7 @@ void Tokenizer::setVarId()
if (tok->strAt(-1) == "return") if (tok->strAt(-1) == "return")
continue; continue;
if (tok->link() && !Token::Match(tok->link()->tokAt(1), "const| {") && if (tok->link() && !Token::Match(tok->link()->tokAt(1), "const| {") &&
!Token::simpleMatch(tok->link()->tokAt(1), ":")) tok->link()->strAt(1) != ":")
continue; continue;
} }
@ -7742,9 +7747,7 @@ void Tokenizer::simplifyEnum()
continue; continue;
} else if (Token::Match(tok, "enum class|struct| {|:") || } else if (Token::Match(tok, "enum class|struct| {|:") ||
Token::Match(tok, "enum class|struct| %type% {|:|;")) { Token::Match(tok, "enum class|struct| %type% {|:|;")) {
Token *tok1;
Token *start = tok; Token *start = tok;
Token *end;
Token *enumType = 0; Token *enumType = 0;
Token *typeTokenStart = 0; Token *typeTokenStart = 0;
Token *typeTokenEnd = 0; Token *typeTokenEnd = 0;
@ -7800,8 +7803,8 @@ void Tokenizer::simplifyEnum()
return; return;
} }
tok1 = tok->next(); Token *tok1 = tok->next();
end = tok1->link(); Token *end = tok1->link();
tok1 = tok1->next(); tok1 = tok1->next();
MathLib::bigint lastValue = -1; MathLib::bigint lastValue = -1;