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

Fix for ticket 291 - preprocessor: better handling of defines 

http://apps.sourceforge.net/trac/cppcheck/ticket/291
This commit is contained in:
Daniel Marjamäki 2009-05-17 18:51:29 +02:00
parent 36cdac1b96
commit 2bd80a7335
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/preprocessor.cpp
View File

@ -508,9 +508,15 @@ std::string Preprocessor::getcode(const std::string &filedata, std::string cfg,
match &= bool(*it);
}
if (line.find("#file \"") == 0 ||
line.find("#endfile") == 0 ||
line.find("#define") == 0)
if (!match && line.find("#define") == 0)
{
// Remove define that is not part of this configuration
line = "";
}
else if (line.find("#file \"") == 0 ||
line.find("#endfile") == 0 ||
line.find("#define") == 0)
{
// We must not remove #file tags or line numbers
// are corrupted. File tags are removed by the tokenizer.

2
test/testpreprocessor.cpp
View File

@ -984,7 +984,7 @@ private:
// Compare results..
ASSERT_EQUALS(2, static_cast<unsigned int>(actual.size()));
ASSERT_EQUALS("\n\n\n\n\n20\n", actual[""]);
TODO_ASSERT_EQUALS("\n\n\n\n\n10\n", actual["A"]);
ASSERT_EQUALS("\n\n\n\n\n10\n", actual["A"]);
ASSERT_EQUALS("", errout.str());
}