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 2018-04-17 08:12:15 +02:00
parent ebb3912396
commit f188ea33c6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1179,6 +1179,8 @@ namespace simplecpp {
++par; ++par;
else if (rawtok->op == ')') else if (rawtok->op == ')')
--par; --par;
else if (rawtok->op == '#' && !sameline(rawtok->previous, rawtok))
throw Error(rawtok->location, "it is invalid to use a preprocessor directive as macro parameter");
rawtokens2.push_back(new Token(rawtok->str, rawtok1->location)); rawtokens2.push_back(new Token(rawtok->str, rawtok1->location));
rawtok = rawtok->next; rawtok = rawtok->next;
} }
@ -2313,10 +2315,13 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
} }
if (rawtok->op == '#' && !sameline(rawtok->previous, rawtok)) { if (rawtok->op == '#' && !sameline(rawtok->previous, rawtok)) {
if (!sameline(rawtok, rawtok->next)) {
rawtok = rawtok->next;
continue;
}
rawtok = rawtok->next; rawtok = rawtok->next;
if (!rawtok || !rawtok->name) { if (!rawtok->name) {
if (rawtok) rawtok = gotoNextLine(rawtok);
rawtok = gotoNextLine(rawtok);
continue; continue;
} }