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 2019-03-31 07:49:43 +02:00
parent 5f364ca30d
commit fe10420d23
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
externals/simplecpp/simplecpp.cpp vendored
View File

@ -327,15 +327,6 @@ static void ungetChar(std::istream &istr, unsigned int bom)
istr.unget(); istr.unget();
} }
static unsigned char prevChar(std::istream &istr, unsigned int bom)
{
ungetChar(istr, bom);
ungetChar(istr, bom);
unsigned char c = readChar(istr, bom);
readChar(istr, bom);
return c;
}
static unsigned short getAndSkipBOM(std::istream &istr) static unsigned short getAndSkipBOM(std::istream &istr)
{ {
const int ch1 = istr.peek(); const int ch1 = istr.peek();
@ -556,7 +547,8 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
// string / char literal // string / char literal
else if (ch == '\"' || ch == '\'') { else if (ch == '\"' || ch == '\'') {
std::string prefix; std::string prefix;
if (cback() && cback()->name && !std::isspace(prevChar(istr, bom)) && (isStringLiteralPrefix(cback()->str()))) { if (cback() && cback()->name && isStringLiteralPrefix(cback()->str()) &&
((cback()->location.col + cback()->str().size()) == location.col)) {
prefix = cback()->str(); prefix = cback()->str();
} }
// C++11 raw string literal // C++11 raw string literal