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

Fixed #1951 (Preprocessor: Compound macro statements not handled correctly)

This commit is contained in:
Daniel Marjamäki 2010-09-24 21:38:11 +02:00
parent 4c98a7e67b
commit 86e517c5d3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/preprocessor.cpp
View File

@ -1176,7 +1176,7 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &v
if (!it->second.empty()) if (!it->second.empty())
tok->str(it->second); tok->str(it->second);
else if ((!tok->previous() || tok->strAt(-1) == "||" || tok->strAt(-1) == "&&" || tok->strAt(-1) == "(") && else if ((!tok->previous() || tok->strAt(-1) == "||" || tok->strAt(-1) == "&&" || tok->strAt(-1) == "(") &&
(!tok->next() || tok->strAt(1) == "||" || tok->strAt(1) == "&&" || tok->strAt(-1) == ")")) (!tok->next() || tok->strAt(1) == "||" || tok->strAt(1) == "&&" || tok->strAt(1) == ")"))
tok->str("1"); tok->str("1");
else else
tok->deleteThis(); tok->deleteThis();
@ -1200,6 +1200,17 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &v
} }
} }
for (Token *tok = const_cast<Token *>(tokenizer.tokens()); tok; tok = tok->next())
{
while ((tok->str() == "(" || tok->str() == "||") && (Token::simpleMatch(tok->tokAt(2), "|| 1")))
{
tok->deleteNext();
tok->deleteNext();
if (tok->tokAt(-3))
tok = tok->tokAt(-3);
}
}
if (Token::simpleMatch(tokenizer.tokens(), "( 1 )") || if (Token::simpleMatch(tokenizer.tokens(), "( 1 )") ||
Token::simpleMatch(tokenizer.tokens(), "( 1 ||")) Token::simpleMatch(tokenizer.tokens(), "( 1 ||"))
condition = "1"; condition = "1";

4
test/testpreprocessor.cpp
View File

@ -1143,8 +1143,8 @@ private:
const std::string code("#if X || Y\n" const std::string code("#if X || Y\n"
"a1;\n" "a1;\n"
"#endif\n"); "#endif\n");
const std::string actual = Preprocessor::getcode(code, "X", "test.c", NULL, NULL); ASSERT_EQUALS("\na1;\n\n", Preprocessor::getcode(code, "X", "test.c", NULL, NULL));
ASSERT_EQUALS("\na1;\n\n", actual); ASSERT_EQUALS("\na1;\n\n", Preprocessor::getcode(code, "Y", "test.c", NULL, NULL));
} }