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

bump simplecpp to rev c70bae00a9b92eca75767e547fad972cf011945f

This commit is contained in:
Daniel Marjamäki 2016-12-04 12:10:28 +01:00
parent 9c69546d72
commit 6086165403
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
externals/simplecpp/simplecpp.cpp vendored
View File

@ -466,7 +466,7 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
} }
if (multiline || startsWith(lastLine(10),"# ")) { if (multiline || startsWith(lastLine(10),"# ")) {
pos = 0; pos = 0;
while ((pos = currentToken.find("\n",pos)) != std::string::npos) { while ((pos = currentToken.find('\n',pos)) != std::string::npos) {
currentToken.erase(pos,1); currentToken.erase(pos,1);
++multiline; ++multiline;
} }
@ -1646,7 +1646,7 @@ std::string simplifyPath(std::string path) {
// remove "xyz/../" // remove "xyz/../"
pos = 1U; pos = 1U;
while ((pos = path.find("/../", pos)) != std::string::npos) { while ((pos = path.find("/../", pos)) != std::string::npos) {
const std::string::size_type pos1 = path.rfind("/", pos - 1U); const std::string::size_type pos1 = path.rfind('/', pos - 1U);
if (pos1 == std::string::npos) if (pos1 == std::string::npos)
pos++; pos++;
else { else {
@ -1683,7 +1683,7 @@ void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::string, std:
for (simplecpp::Token *typeToken = tok1; typeToken != tok2; typeToken = typeToken->next) { for (simplecpp::Token *typeToken = tok1; typeToken != tok2; typeToken = typeToken->next) {
if ((typeToken->str == "unsigned" || typeToken->str == "signed") && typeToken->next->name) if ((typeToken->str == "unsigned" || typeToken->str == "signed") && typeToken->next->name)
continue; continue;
if (typeToken->str == "*" && type.find("*") != std::string::npos) if (typeToken->str == "*" && type.find('*') != std::string::npos)
continue; continue;
if (!type.empty()) if (!type.empty())
type += ' '; type += ' ';
@ -1931,8 +1931,8 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
std::map<TokenString, Macro> macros; std::map<TokenString, Macro> macros;
for (std::list<std::string>::const_iterator it = dui.defines.begin(); it != dui.defines.end(); ++it) { for (std::list<std::string>::const_iterator it = dui.defines.begin(); it != dui.defines.end(); ++it) {
const std::string &macrostr = *it; const std::string &macrostr = *it;
const std::string::size_type eq = macrostr.find("="); const std::string::size_type eq = macrostr.find('=');
const std::string::size_type par = macrostr.find("("); const std::string::size_type par = macrostr.find('(');
const std::string macroname = macrostr.substr(0, std::min(eq,par)); const std::string macroname = macrostr.substr(0, std::min(eq,par));
if (dui.undefined.find(macroname) != dui.undefined.end()) if (dui.undefined.find(macroname) != dui.undefined.end())
continue; continue;
@ -1980,6 +1980,17 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
continue; continue;
} }
if (ifstates.size() <= 1U && (rawtok->str == ELIF || rawtok->str == ELSE || rawtok->str == ENDIF)) {
simplecpp::Output err(files);
err.type = Output::SYNTAX_ERROR;
err.location = rawtok->location;
err.msg = "#" + rawtok->str + " without #if";
if (outputList)
outputList->push_back(err);
output.clear();
return;
}
if (ifstates.top() == TRUE && (rawtok->str == ERROR || rawtok->str == WARNING)) { if (ifstates.top() == TRUE && (rawtok->str == ERROR || rawtok->str == WARNING)) {
if (outputList) { if (outputList) {
simplecpp::Output err(rawtok->location.files); simplecpp::Output err(rawtok->location.files);
@ -2170,7 +2181,6 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
} else if (rawtok->str == ELSE) { } else if (rawtok->str == ELSE) {
ifstates.top() = (ifstates.top() == ELSE_IS_TRUE) ? TRUE : ALWAYS_FALSE; ifstates.top() = (ifstates.top() == ELSE_IS_TRUE) ? TRUE : ALWAYS_FALSE;
} else if (rawtok->str == ENDIF) { } else if (rawtok->str == ENDIF) {
if (ifstates.size() > 1U)
ifstates.pop(); ifstates.pop();
} else if (rawtok->str == UNDEF) { } else if (rawtok->str == UNDEF) {
if (ifstates.top() == TRUE) { if (ifstates.top() == TRUE) {