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-05-03 18:49:48 +02:00
parent b1cb03b560
commit 81b02197e8
2 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
externals/simplecpp/simplecpp.cpp vendored
View File

@ -200,6 +200,13 @@ simplecpp::TokenList::TokenList(const TokenList &other) : frontToken(NULL), back
*this = other; *this = other;
} }
#if __cplusplus >= 201103L
simplecpp::TokenList::TokenList(TokenList &&other) : frontToken(NULL), backToken(NULL), files(other.files)
{
*this = std::move(other);
}
#endif
simplecpp::TokenList::~TokenList() simplecpp::TokenList::~TokenList()
{ {
clear(); clear();
@ -216,6 +223,21 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(const TokenList &other)
return *this; return *this;
} }
#if __cplusplus >= 201103L
simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
{
if (this != &other) {
clear();
backToken = other.backToken;
other.backToken = NULL;
frontToken = other.frontToken;
other.frontToken = NULL;
sizeOfType = std::move(other.sizeOfType);
}
return *this;
}
#endif
void simplecpp::TokenList::clear() void simplecpp::TokenList::clear()
{ {
backToken = NULL; backToken = NULL;
@ -390,6 +412,23 @@ static bool isStringLiteralPrefix(const std::string &str)
str == "R" || str == "uR" || str == "UR" || str == "LR" || str == "u8R"; str == "R" || str == "uR" || str == "UR" || str == "LR" || str == "u8R";
} }
void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int line, Location *location)
{
if (fileIndex != location->fileIndex || line >= location->line) {
location->fileIndex = fileIndex;
location->line = line;
return;
}
if (line + 2 >= location->line) {
location->line = line;
while (cback()->op != '#')
deleteToken(back());
deleteToken(back());
return;
}
}
void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filename, OutputList *outputList) void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filename, OutputList *outputList)
{ {
std::stack<simplecpp::Location> loc; std::stack<simplecpp::Location> loc;
@ -446,16 +485,10 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U)); location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
location.line = 1U; location.line = 1U;
} else if (lastline == "# line %num%") { } else if (lastline == "# line %num%") {
loc.push(location); lineDirective(location.fileIndex, std::atol(cback()->str().c_str()), &location);
location.line = std::atol(cback()->str().c_str()); } else if (lastline == "# %num% %str%" || lastline == "# line %num% %str%") {
} else if (lastline == "# line %num% %str%") { lineDirective(fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U)),
loc.push(location); std::atol(cback()->previous->str().c_str()), &location);
location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
location.line = std::atol(cback()->previous->str().c_str());
} else if (lastline == "# %num% %str%") {
loc.push(location);
location.fileIndex = fileIndex(cback()->str().substr(1U, cback()->str().size() - 2U));
location.line = std::atol(cback()->previous->str().c_str());
} }
// #endfile // #endfile
else if (lastline == "# endfile" && !loc.empty()) { else if (lastline == "# endfile" && !loc.empty()) {
@ -548,7 +581,8 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
else if (ch == '\"' || ch == '\'') { else if (ch == '\"' || ch == '\'') {
std::string prefix; std::string prefix;
if (cback() && cback()->name && isStringLiteralPrefix(cback()->str()) && if (cback() && cback()->name && isStringLiteralPrefix(cback()->str()) &&
((cback()->location.col + cback()->str().size()) == location.col)) { ((cback()->location.col + cback()->str().size()) == location.col) &&
(cback()->location.line == location.line)) {
prefix = cback()->str(); prefix = cback()->str();
} }
// C++11 raw string literal // C++11 raw string literal
@ -1116,9 +1150,9 @@ std::string simplecpp::TokenList::lastLine(int maxsize) const
if (tok->comment) if (tok->comment)
continue; continue;
if (!ret.empty()) if (!ret.empty())
ret = ' ' + ret; ret.insert(0, 1, ' ');
ret = (tok->str()[0] == '\"' ? std::string("%str%") ret.insert(0, tok->str()[0] == '\"' ? std::string("%str%")
: tok->number ? std::string("%num%") : tok->str()) + ret; : tok->number ? std::string("%num%") : tok->str());
if (++count > maxsize) if (++count > maxsize)
return ""; return "";
} }
@ -2016,7 +2050,7 @@ static std::string realFilename(const std::string &f)
continue; continue;
} }
bool isDriveSpecification = bool isDriveSpecification =
(pos == 2 && subpath.size() == 2 && std::isalpha(subpath[0]) && subpath[1] == ':'); (pos == 2 && subpath.size() == 2 && std::isalpha(subpath[0]) && subpath[1] == ':');
// Append real filename (proper case) // Append real filename (proper case)
@ -2282,23 +2316,21 @@ static std::string _openHeader(std::ifstream &f, const std::string &path)
#endif #endif
} }
static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header, bool systemheader) static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header)
{ {
if (isAbsolutePath(header)) { if (isAbsolutePath(header)) {
return _openHeader(f, header); return _openHeader(f, header);
} }
if (!systemheader) { if (sourcefile.find_first_of("\\/") != std::string::npos) {
if (sourcefile.find_first_of("\\/") != std::string::npos) { const std::string s = sourcefile.substr(0, sourcefile.find_last_of("\\/") + 1U) + header;
const std::string s = sourcefile.substr(0, sourcefile.find_last_of("\\/") + 1U) + header; const std::string simplePath = _openHeader(f, s);
std::string simplePath = _openHeader(f, s); if (!simplePath.empty())
if (!simplePath.empty()) return simplePath;
return simplePath; } else {
} else { const std::string simplePath = _openHeader(f, header);
std::string simplePath = _openHeader(f, header); if (!simplePath.empty())
if (!simplePath.empty()) return simplePath;
return simplePath;
}
} }
for (std::list<std::string>::const_iterator it = dui.includePaths.begin(); it != dui.includePaths.end(); ++it) { for (std::list<std::string>::const_iterator it = dui.includePaths.begin(); it != dui.includePaths.end(); ++it) {
@ -2407,7 +2439,7 @@ std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::To
continue; continue;
std::ifstream f; std::ifstream f;
const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader); const std::string header2 = openHeader(f,dui,sourcefile,header);
if (!f.is_open()) if (!f.is_open())
continue; continue;
@ -2628,7 +2660,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
if (header2.empty()) { if (header2.empty()) {
// try to load file.. // try to load file..
std::ifstream f; std::ifstream f;
header2 = openHeader(f, dui, rawtok->location.file(), header, systemheader); header2 = openHeader(f, dui, rawtok->location.file(), header);
if (f.is_open()) { if (f.is_open()) {
TokenList *tokens = new TokenList(f, files, header2, outputList); TokenList *tokens = new TokenList(f, files, header2, outputList);
filedata[header2] = tokens; filedata[header2] = tokens;

9
externals/simplecpp/simplecpp.h vendored
View File

@ -108,7 +108,7 @@ namespace simplecpp {
void flags() { void flags() {
name = (std::isalpha((unsigned char)string[0]) || string[0] == '_' || string[0] == '$'); name = (std::isalpha((unsigned char)string[0]) || string[0] == '_' || string[0] == '$');
comment = (string.compare(0, 2, "//") == 0 || string.compare(0, 2, "/*") == 0); comment = string.size() > 1U && string[0] == '/' && (string[1] == '/' || string[1] == '*');
number = std::isdigit((unsigned char)string[0]) || (string.size() > 1U && string[0] == '-' && std::isdigit((unsigned char)string[1])); number = std::isdigit((unsigned char)string[0]) || (string.size() > 1U && string[0] == '-' && std::isdigit((unsigned char)string[1]));
op = (string.size() == 1U) ? string[0] : '\0'; op = (string.size() == 1U) ? string[0] : '\0';
} }
@ -181,8 +181,14 @@ namespace simplecpp {
explicit TokenList(std::vector<std::string> &filenames); explicit TokenList(std::vector<std::string> &filenames);
TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = 0); TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = 0);
TokenList(const TokenList &other); TokenList(const TokenList &other);
#if __cplusplus >= 201103L
TokenList(TokenList &&other);
#endif
~TokenList(); ~TokenList();
TokenList &operator=(const TokenList &other); TokenList &operator=(const TokenList &other);
#if __cplusplus >= 201103L
TokenList &operator=(TokenList &&other);
#endif
void clear(); void clear();
bool empty() const { bool empty() const {
@ -259,6 +265,7 @@ namespace simplecpp {
void constFoldQuestionOp(Token **tok1); void constFoldQuestionOp(Token **tok1);
std::string readUntil(std::istream &istr, const Location &location, const char start, const char end, OutputList *outputList, unsigned int bom); std::string readUntil(std::istream &istr, const Location &location, const char start, const char end, OutputList *outputList, unsigned int bom);
void lineDirective(unsigned int fileIndex, unsigned int line, Location *location);
std::string lastLine(int maxsize=100000) const; std::string lastLine(int maxsize=100000) const;