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

Merge pull request #167 from simartin/ticket_4450 

Fix Ticket #4450
This commit is contained in:
Daniel Marjamäki 2013-08-24 14:12:44 -07:00
parent 26de3646e9 b713a69b30
commit b20f44cf6a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -5244,7 +5244,11 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, Token * tokEnd, bool only_k_r_
if (isstatic) { if (isstatic) {
if (Token::Match(tok2->next(), "%num% ,")) if (Token::Match(tok2->next(), "%num% ,"))
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
else else if (Token::Match(tok2->next(), "( %num% ) ,")) { // ticket #4450
tok2->deleteNext();
tok2->next()->deleteNext();
tok2 = tok2->tokAt(2);
} else
tok2 = NULL; tok2 = NULL;
} else if (isconst && !ispointer) { } else if (isconst && !ispointer) {
//do not split const non-pointer variables.. //do not split const non-pointer variables..

7
test/testtokenize.cpp
View File

@ -5581,6 +5581,13 @@ private:
const char code[] = "static unsigned int *a=0, *b=0;"; const char code[] = "static unsigned int *a=0, *b=0;";
ASSERT_EQUALS("static unsigned int * a = 0 ; static unsigned int * b = 0 ;", tokenizeAndStringify(code)); ASSERT_EQUALS("static unsigned int * a = 0 ; static unsigned int * b = 0 ;", tokenizeAndStringify(code));
} }
{
const char code[] = "static int large_eeprom_type = (13 | (5)), "
"default_flash_type = 42;";
ASSERT_EQUALS("static int large_eeprom_type = 13 ; static int default_flash_type = 42 ;",
tokenizeAndStringify(code));
}
} }
void vardecl6() { void vardecl6() {