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

Merge pull request #554 from Dmitry-Me/moveDeclaartionToFirstUse 

Move declaration to where it's first needed
This commit is contained in:
amai2012 2015-03-18 09:46:44 +01:00
parent 63fc5925bc 15a847cc0d
commit e5e7c5dc8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -9228,7 +9228,6 @@ void Tokenizer::simplifyAttribute()
} }
else if (Token::Match(tok->tokAt(2), "( unused|__unused__|used|__used__ )")) { else if (Token::Match(tok->tokAt(2), "( unused|__unused__|used|__used__ )")) {
const std::string &attribute(tok->strAt(3));
Token *vartok = nullptr; Token *vartok = nullptr;
// check if after variable name // check if after variable name
@ -9242,6 +9241,7 @@ void Tokenizer::simplifyAttribute()
vartok = tok->next()->link()->next(); vartok = tok->next()->link()->next();
if (vartok) { if (vartok) {
const std::string &attribute(tok->strAt(3));
if (attribute.find("unused") != std::string::npos) if (attribute.find("unused") != std::string::npos)
vartok->isAttributeUnused(true); vartok->isAttributeUnused(true);
else else
@ -9250,7 +9250,6 @@ void Tokenizer::simplifyAttribute()
} }
else if (Token::Match(tok->tokAt(2), "( pure|__pure__|const|__const__|noreturn|__noreturn__|nothrow|__nothrow__ )")) { else if (Token::Match(tok->tokAt(2), "( pure|__pure__|const|__const__|noreturn|__noreturn__|nothrow|__nothrow__ )")) {
const std::string &attribute(tok->strAt(3));
Token *functok = nullptr; Token *functok = nullptr;
// type func(...) __attribute__((attribute)); // type func(...) __attribute__((attribute));
@ -9267,6 +9266,7 @@ void Tokenizer::simplifyAttribute()
} }
if (functok) { if (functok) {
const std::string &attribute(tok->strAt(3));
if (attribute.find("pure") != std::string::npos) if (attribute.find("pure") != std::string::npos)
functok->isAttributePure(true); functok->isAttributePure(true);
else if (attribute.find("const") != std::string::npos) else if (attribute.find("const") != std::string::npos)