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

Tokenizer::setVarId: Minor fix of sizeof handling

This commit is contained in:
Daniel Marjamäki 2012-05-15 18:40:24 +02:00
parent 4871cef351
commit 4ae8e4f382
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -2679,6 +2679,12 @@ void Tokenizer::setVarId()
if (tok == list.front() || Token::Match(tok, "[;{}]") || if (tok == list.front() || Token::Match(tok, "[;{}]") ||
(Token::Match(tok,"[(,]") && (!executableScope.top() || Token::simpleMatch(tok->link(), ") {"))) || (Token::Match(tok,"[(,]") && (!executableScope.top() || Token::simpleMatch(tok->link(), ") {"))) ||
(tok->isName() && tok->str().at(tok->str().length()-1U) == ':')) { (tok->isName() && tok->str().at(tok->str().length()-1U) == ':')) {
// No variable declarations in sizeof
if (Token::Match(tok->previous(), "sizeof (")) {
continue;
}
// locate the variable name.. // locate the variable name..
const Token *tok2 = (tok->isName()) ? tok : tok->next(); const Token *tok2 = (tok->isName()) ? tok : tok->next();

8
test/testtokenize.cpp
View File

@ -223,6 +223,7 @@ private:
TEST_CASE(varidStl); TEST_CASE(varidStl);
TEST_CASE(varid_delete); TEST_CASE(varid_delete);
TEST_CASE(varid_functions); TEST_CASE(varid_functions);
TEST_CASE(varid_sizeof);
TEST_CASE(varid_reference_to_containers); TEST_CASE(varid_reference_to_containers);
TEST_CASE(varid_in_class1); TEST_CASE(varid_in_class1);
TEST_CASE(varid_in_class2); TEST_CASE(varid_in_class2);
@ -3437,6 +3438,13 @@ private:
} }
void varid_sizeof() {
const char code[] = "x = sizeof(a*b);";
const char expected[] = "\n\n##file 0\n"
"1: x = sizeof ( a * b ) ;\n";
ASSERT_EQUALS(expected, tokenizeDebugListing(code,false,"test.c"));
}
void varid_reference_to_containers() { void varid_reference_to_containers() {
const std::string actual = tokenizeDebugListing( const std::string actual = tokenizeDebugListing(
"void f()\n" "void f()\n"