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

bump simplecpp

This commit is contained in:
Daniel Marjamäki 2017-08-21 18:43:42 +02:00
parent 2820febaff
commit 468d4923e4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1847,16 +1847,20 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
continue; continue;
simplecpp::Token *tok1 = tok->next; simplecpp::Token *tok1 = tok->next;
if (!tok1) { if (!tok1) {
throw std::runtime_error("missed sizeof argument"); throw std::runtime_error("missing sizeof argument");
} }
simplecpp::Token *tok2 = tok1->next; simplecpp::Token *tok2 = tok1->next;
if (!tok2) { if (!tok2) {
throw std::runtime_error("missed sizeof argument"); throw std::runtime_error("missing sizeof argument");
} }
if (tok1->op == '(') { if (tok1->op == '(') {
tok1 = tok1->next; tok1 = tok1->next;
while (tok2->op != ')') while (tok2->op != ')') {
tok2 = tok2->next; tok2 = tok2->next;
if (!tok2) {
throw std::runtime_error("invalid sizeof expression");
}
}
} }
std::string type; std::string type;
@ -2353,12 +2357,14 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
} }
try { try {
conditionIsTrue = (evaluate(expr, sizeOfType) != 0); conditionIsTrue = (evaluate(expr, sizeOfType) != 0);
} catch (const std::exception &) { } catch (const std::exception &e) {
if (outputList) { if (outputList) {
Output out(rawtok->location.files); Output out(rawtok->location.files);
out.type = Output::SYNTAX_ERROR; out.type = Output::SYNTAX_ERROR;
out.location = rawtok->location; out.location = rawtok->location;
out.msg = "failed to evaluate " + std::string(rawtok->str == IF ? "#if" : "#elif") + " condition"; out.msg = "failed to evaluate " + std::string(rawtok->str == IF ? "#if" : "#elif") + " condition";
if (e.what() && *e.what())
out.msg += std::string(", ") + e.what();
outputList->push_back(out); outputList->push_back(out);
} }
output.clear(); output.clear();