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

Fixed #1084 (define configuration lost)

This commit is contained in:
Daniel Marjamäki 2009-12-13 17:18:27 +01:00
parent b4a454fc47
commit 829a4f8453
5 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/preprocessor.cpp
View File

@ -705,7 +705,7 @@ std::list<std::string> Preprocessor::getcfgs(const std::string &filedata, const
varmap[varname] = value;
}
simplifyCondition(varmap, def);
simplifyCondition(varmap, def, false);
}
if (! deflist.empty() && line.find("#elif ") == 0)
@ -917,7 +917,7 @@ std::list<std::string> Preprocessor::getcfgs(const std::string &filedata, const
}
void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &variables, std::string &condition)
void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &variables, std::string &condition, bool match)
{
Tokenizer tokenizer;
std::istringstream istr(("(" + condition + ")").c_str());
@ -931,10 +931,12 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &v
if (Token::Match(tok, "defined ( %var% )"))
{
if (variables.find(tok->strAt(2)) == variables.end())
if (variables.find(tok->strAt(2)) != variables.end())
tok->str("1");
else if (match)
tok->str("0");
else
tok->str("1");
continue;
tok->deleteNext();
tok->deleteNext();
tok->deleteNext();
@ -943,10 +945,12 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &v
if (Token::Match(tok, "defined %var%"))
{
if (variables.find(tok->strAt(1)) == variables.end())
if (variables.find(tok->strAt(1)) != variables.end())
tok->str("1");
else if (match)
tok->str("0");
else
tok->str("1");
continue;
tok->deleteNext();
continue;
}
@ -990,7 +994,7 @@ bool Preprocessor::match_cfg_def(const std::map<std::string, std::string> &cfg,
//std::cout << "cfg: \"" << cfg << "\" ";
//std::cout << "def: \"" << def << "\"";
simplifyCondition(cfg, def);
simplifyCondition(cfg, def, true);
if (cfg.find(def) != cfg.end())
return true;

3
lib/preprocessor.h
View File

@ -87,8 +87,9 @@ public:
* simplify condition
* @param variables Variable values
* @param condition The condition to simplify
* @param match if true, 'defined(A)' is replaced with 0 if A is not defined
*/
static void simplifyCondition(const std::map<std::string, std::string> &variables, std::string &condition);
static void simplifyCondition(const std::map<std::string, std::string> &variables, std::string &condition, bool match);
protected:

3
test/testcppcheck.cpp
View File

@ -67,7 +67,8 @@ private:
check(filedata);
// Compare results..
ASSERT_EQUALS("[file.cpp:5]: (error) Dereferencing 'foo' after it is deallocated / released\n", errout.str());
ASSERT_EQUALS("Checking file.cpp...\n"
"[file.cpp:5]: (error) Dereferencing 'foo' after it is deallocated / released\n", errout.str());
}
void linenumbers2()

31
test/testpreprocessor.cpp
View File

@ -101,6 +101,8 @@ private:
TEST_CASE(if_cond6);
TEST_CASE(if_cond7);
TEST_CASE(if_or);
TEST_CASE(multiline1);
TEST_CASE(multiline2);
TEST_CASE(multiline3);
@ -834,6 +836,35 @@ private:
}
void if_or()
{
const char filedata[] = "#if defined(DEF_10) || defined(DEF_11)\n"
"a1;\n"
"#endif\n";
errout.str("");
// Preprocess => actual result..
std::istringstream istr(filedata);
std::map<std::string, std::string> actual;
Settings settings;
settings._verbose = true;
settings._debug = true;
Preprocessor preprocessor(&settings, this);
preprocessor.preprocess(istr, actual, "file.c");
// Compare results..
ASSERT_EQUALS(1, actual.size());
ASSERT_EQUALS("\n\n\n", actual[""]);
// the "defined(DEF_10) || defined(DEF_11)" are not handled correctly..
ASSERT_EQUALS("unhandled configuration: defined(DEF_10)||defined(DEF_11)\n", errout.str());
TODO_ASSERT_EQUALS(2, actual.size());
TODO_ASSERT_EQUALS("\na1;\n\n", actual["DEF_10"]);
}
void multiline1()
{
const char filedata[] = "#define str \"abc\" \\\n"

4
test/testsuite.cpp
View File

@ -180,9 +180,9 @@ size_t TestFixture::runTests(const char cmd[])
return fails_counter;
}
void TestFixture::reportOut(const std::string & /*outmsg*/)
void TestFixture::reportOut(const std::string & outmsg)
{
// These can probably be ignored
errout << outmsg << std::endl;
}
void TestFixture::reportErr(const ErrorLogger::ErrorMessage &msg)