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

Merge pull request #511 from Dmitry-Me/reorderChecks2 

Reorder checks, move declaration
This commit is contained in:
PKEuS 2015-02-06 20:07:12 +01:00
parent eec938dbad 6f6f9f7754
commit 703114dd0d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -2300,9 +2300,6 @@ void Tokenizer::simplifyTemplates()
static bool setVarIdParseDeclaration(const Token **tok, const std::map<std::string,unsigned int> &variableId, bool executableScope, bool cpp, bool c) static bool setVarIdParseDeclaration(const Token **tok, const std::map<std::string,unsigned int> &variableId, bool executableScope, bool cpp, bool c)
{ {
const Token *tok2 = *tok; const Token *tok2 = *tok;
bool ref = false;
if (!tok2->isName()) if (!tok2->isName())
return false; return false;
@ -2310,6 +2307,7 @@ static bool setVarIdParseDeclaration(const Token **tok, const std::map<std::stri
unsigned int singleNameCount = 0; unsigned int singleNameCount = 0;
bool hasstruct = false; // Is there a "struct" or "class"? bool hasstruct = false; // Is there a "struct" or "class"?
bool bracket = false; bool bracket = false;
bool ref = false;
while (tok2) { while (tok2) {
if (tok2->isName()) { if (tok2->isName()) {
if (cpp && Token::Match(tok2, "namespace|public|private|protected")) if (cpp && Token::Match(tok2, "namespace|public|private|protected"))
@ -2363,7 +2361,7 @@ static bool setVarIdParseDeclaration(const Token **tok, const std::map<std::stri
// Check if array declaration is valid (#2638) // Check if array declaration is valid (#2638)
// invalid declaration: AAA a[4] = 0; // invalid declaration: AAA a[4] = 0;
if (typeCount >= 2 && tok2 && tok2->str() == "[" && executableScope) { if (typeCount >= 2 && executableScope && tok2 && tok2->str() == "[") {
const Token *tok3 = tok2; const Token *tok3 = tok2;
while (tok3 && tok3->str() == "[") { while (tok3 && tok3->str() == "[") {
tok3 = tok3->link()->next(); tok3 = tok3->link()->next();