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

Preprocessor: Better fix for hangs. And added proper unit test.

This commit is contained in:
Daniel Marjamäki 2013-01-27 02:53:29 +01:00
parent a0d8fd26fe
commit 42dd956dff
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/preprocessor.cpp
View File

@ -993,13 +993,13 @@ std::string Preprocessor::getdef(std::string line, bool def)
} }
/** Simplify variable in variable map. */ /** Simplify variable in variable map. */
static void simplifyVarMapExpandValue(Token *tok, const std::map<std::string, std::string> &variables, std::set<std::string> &seenVariables) static Token *simplifyVarMapExpandValue(Token *tok, const std::map<std::string, std::string> &variables, std::set<std::string> seenVariables)
{ {
// TODO: handle function-macros too. // TODO: handle function-macros too.
// Prevent infinite recursion.. // Prevent infinite recursion..
if (seenVariables.find(tok->str()) != seenVariables.end()) if (seenVariables.find(tok->str()) != seenVariables.end())
return; return tok;
seenVariables.insert(tok->str()); seenVariables.insert(tok->str());
const std::map<std::string, std::string>::const_iterator it = variables.find(tok->str()); const std::map<std::string, std::string>::const_iterator it = variables.find(tok->str());
@ -1024,6 +1024,8 @@ static void simplifyVarMapExpandValue(Token *tok, const std::map<std::string, st
} }
} }
} }
return tok;
} }
/** /**
@ -1033,14 +1035,13 @@ static void simplifyVarMapExpandValue(Token *tok, const std::map<std::string, st
static void simplifyVarMap(std::map<std::string, std::string> &variables) static void simplifyVarMap(std::map<std::string, std::string> &variables)
{ {
for (std::map<std::string, std::string>::iterator i = variables.begin(); i != variables.end(); ++i) { for (std::map<std::string, std::string>::iterator i = variables.begin(); i != variables.end(); ++i) {
std::set<std::string> seenVariables;
TokenList tokenList(NULL); TokenList tokenList(NULL);
std::istringstream istr(i->second); std::istringstream istr(i->second);
if (tokenList.createTokens(istr)) { if (tokenList.createTokens(istr)) {
for (Token *tok = tokenList.front(); tok; tok = tok->next()) { for (Token *tok = tokenList.front(); tok; tok = tok->next()) {
if (tok->isName()) { if (tok->isName()) {
simplifyVarMapExpandValue(tok, variables, seenVariables); std::set<std::string> seenVariables;
tok = simplifyVarMapExpandValue(tok, variables, seenVariables);
} }
} }

8
test/testpreprocessor.cpp
View File

@ -2759,6 +2759,14 @@ private:
Preprocessor preprocessor(NULL, this); Preprocessor preprocessor(NULL, this);
ASSERT_EQUALS("\n\n\n\nFOO\n\n", preprocessor.getcode(filedata,"","")); ASSERT_EQUALS("\n\n\n\nFOO\n\n", preprocessor.getcode(filedata,"",""));
} }
{
const char filedata[] = "#define A (1+A)\n" // don't hang for recursive macros
"#if A==1\n"
"FOO\n"
"#endif";
Preprocessor preprocessor(NULL, this);
ASSERT_EQUALS("\n\n\n\n", preprocessor.getcode(filedata,"",""));
}
} }
void define_ifdef() { void define_ifdef() {