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

update simplecpp

This commit is contained in:
Daniel Marjamäki 2018-03-15 21:34:58 +01:00
parent ad5f7cbf71
commit 57b96d3aaa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1676,8 +1676,13 @@ namespace simplecpp {
throw invalidHashHash(tok->location, name()); throw invalidHashHash(tok->location, name());
if (!sameline(tok, tok->next) || !sameline(tok, tok->next->next)) if (!sameline(tok, tok->next) || !sameline(tok, tok->next->next))
throw invalidHashHash(tok->location, name()); throw invalidHashHash(tok->location, name());
if (!A->name && !A->number && A->op != ',' && !A->str.empty())
throw invalidHashHash(tok->location, name());
Token *B = tok->next->next; Token *B = tok->next->next;
if (!B->name && !B->number && B->op && B->op != '#')
throw invalidHashHash(tok->location, name());
std::string strAB; std::string strAB;
const bool varargs = variadic && args.size() >= 1U && B->str == args[args.size()-1U]; const bool varargs = variadic && args.size() >= 1U && B->str == args[args.size()-1U];
@ -2343,6 +2348,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
} }
inc2.clear(); inc2.clear();
inc2.push_back(new Token(hdr, inc1.cfront()->location)); inc2.push_back(new Token(hdr, inc1.cfront()->location));
inc2.front()->op = '<';
} }
if (inc2.empty() || inc2.cfront()->str.size() <= 2U) { if (inc2.empty() || inc2.cfront()->str.size() <= 2U) {
@ -2376,7 +2382,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
simplecpp::Output out(files); simplecpp::Output out(files);
out.type = Output::MISSING_HEADER; out.type = Output::MISSING_HEADER;
out.location = rawtok->location; out.location = rawtok->location;
out.msg = "Header not found: " + rawtok->next->str; out.msg = "Header not found: " + inctok->str;
outputList->push_back(out); outputList->push_back(out);
} }
} else if (includetokenstack.size() >= 400) { } else if (includetokenstack.size() >= 400) {