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

Merge pull request #209 from simartin/ticket_5266 

Ticket #5266: Properly tokenize "complex" static variable declarations.
This commit is contained in:
Daniel Marjamäki 2014-01-05 04:44:22 -08:00
parent 0851408a26 d2cf9fd77c
commit 29c64cc34c
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tokenize.cpp
View File

@ -5389,17 +5389,7 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, Token * tokEnd, bool only_k_r_
if (varName->str() != "operator") { if (varName->str() != "operator") {
tok2 = varName->next(); // The ',' or '=' token tok2 = varName->next(); // The ',' or '=' token
if (tok2->str() == "=") { if (tok2->str() == "=" && (isstatic || (isconst && !ispointer))) {
if (isstatic) {
if (Token::Match(tok2->next(), "%num%|%var% ,")) // ticket #5121
tok2 = tok2->tokAt(2);
else if (Token::Match(tok2->next(), "( %num%|%var% ) ,")) { // ticket #4450
tok2->deleteNext();
tok2->next()->deleteNext();
tok2 = tok2->tokAt(2);
} else
tok2 = NULL;
} else if (isconst && !ispointer) {
//do not split const non-pointer variables.. //do not split const non-pointer variables..
while (tok2 && tok2->str() != "," && tok2->str() != ";") { while (tok2 && tok2->str() != "," && tok2->str() != ";") {
if (tok2->str() == "{" || tok2->str() == "(" || tok2->str() == "[") if (tok2->str() == "{" || tok2->str() == "(" || tok2->str() == "[")
@ -5411,7 +5401,6 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, Token * tokEnd, bool only_k_r_
if (tok2 && tok2->str() == ";") if (tok2 && tok2->str() == ";")
tok2 = NULL; tok2 = NULL;
} }
}
} else } else
tok2 = NULL; tok2 = NULL;
} }

13
test/testtokenize.cpp
View File

@ -5777,6 +5777,19 @@ private:
"}", "}",
tokenizeAndStringify(code)); tokenizeAndStringify(code));
} }
{
// Ticket #5266
const char code[] = "class Machine {\n"
" static int const STACK_ORDER = 10, STACK_MAX = 1 << STACK_ORDER,"
" STACK_GUARD = 2;\n"
"};";
ASSERT_EQUALS("class Machine {\n"
"static const int STACK_ORDER = 10 ; static const int STACK_MAX = 1 << STACK_ORDER ; "
"static const int STACK_GUARD = 2 ;\n"
"} ;",
tokenizeAndStringify(code));
}
} }
void vardecl6() { void vardecl6() {