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

Remove duplicated defines 

After simplifying define(A) conditionals, the final list of
configurations could end up containing duplicate items.

Ticket #1468
This commit is contained in:
Raphael Geissert 2011-01-30 02:09:12 -06:00
parent 09998d9e18
commit 49848fd752
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/preprocessor.cpp
View File

@ -1040,6 +1040,7 @@ std::list<std::string> Preprocessor::getcfgs(const std::string &filedata, const
// Re-constitute the configuration after sorting the defines
defs.sort();
defs.unique();
*it = join(defs, ';');
}

37
test/testpreprocessor.cpp
View File

@ -173,6 +173,7 @@ private:
TEST_CASE(endifsemicolon);
TEST_CASE(missing_doublequote);
TEST_CASE(handle_error);
TEST_CASE(dup_defines);
TEST_CASE(unicodeInCode);
TEST_CASE(unicodeInComment);
@ -2380,6 +2381,42 @@ private:
ASSERT_EQUALS("char a[] = \"#endfile\";\nchar b[] = \"#endfile\";\n\n", actual[""]);
ASSERT_EQUALS(1, (int)actual.size());
}
void dup_defines()
{
const char filedata[] = "#ifdef A\n"
"#define B\n"
"#if defined(B) && defined(A)\n"
"a\n"
"#else\n"
"b\n"
"#endif\n"
"#endif\n";
// Preprocess => actual result..
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Settings settings;
Preprocessor preprocessor(&settings, this);
preprocessor.preprocess(istr, actual, "file.c");
// B will always be defined if A is defined; the following test
// cases should be fixed whenever this other bug is fixed
TODO_ASSERT_EQUALS(2, static_cast<unsigned int>(actual.size()));
ASSERT_EQUALS(3, static_cast<unsigned int>(actual.size()));
if (actual.find("A") == actual.end()) {
ASSERT_EQUALS("A is checked", "failed");
} else {
ASSERT_EQUALS("A is checked", "A is checked");
}
if (actual.find("A;A;B") != actual.end()) {
ASSERT_EQUALS("A;A;B is NOT checked", "failed");
} else {
ASSERT_EQUALS("A;A;B is NOT checked", "A;A;B is NOT checked");
}
}
};
REGISTER_TEST(TestPreprocessor)