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

Tokenizer: Replace __null with 0 (gcc constant)

This commit is contained in:
Robert Reif 2011-02-05 09:03:31 +01:00 committed by Daniel Marjamäki
parent c592ccd35d
commit 95e917b27f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tokenize.cpp
View File

@ -2071,7 +2071,8 @@ bool Tokenizer::tokenize(std::istream &code,
// Replace NULL with 0.. // Replace NULL with 0..
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
{ {
if (tok->str() == "NULL" || tok->str() == "'\\0'" || tok->str() == "'\\x0'") if (tok->str() == "NULL" || tok->str() == "__null" ||
tok->str() == "'\\0'" || tok->str() == "'\\x0'")
{ {
tok->str("0"); tok->str("0");
} }

11
test/testtokenize.cpp
View File

@ -213,6 +213,7 @@ private:
TEST_CASE(simplify_constants); TEST_CASE(simplify_constants);
TEST_CASE(simplify_constants2); TEST_CASE(simplify_constants2);
TEST_CASE(simplify_constants3); TEST_CASE(simplify_constants3);
TEST_CASE(simplify_null);
TEST_CASE(vardecl1); TEST_CASE(vardecl1);
TEST_CASE(vardecl2); TEST_CASE(vardecl2);
@ -3879,6 +3880,16 @@ private:
ASSERT_EQUALS(expected, tokenizeAndStringify(code,true)); ASSERT_EQUALS(expected, tokenizeAndStringify(code,true));
} }
void simplify_null()
{
const char code[] =
"int * p = NULL;\n"
"int * q = __null;\n";
const char expected[] =
"int * p ; p = 0 ;\nint * q ; q = 0 ;";
ASSERT_EQUALS(expected, tokenizeAndStringify(code,true));
}
void vardecl1() void vardecl1()
{ {
const char code[] = "unsigned int a, b;"; const char code[] = "unsigned int a, b;";