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

ErrorLogger: Write ErrorPath info in the xml report

This commit is contained in:
Daniel Marjamäki 2017-05-16 22:58:02 +02:00
parent c617851567
commit ecb3f0a934
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/errorlogger.cpp
View File

@ -193,9 +193,9 @@ std::string ErrorLogger::ErrorMessage::serialize() const
oss << saneVerboseMessage.length() << " " << saneVerboseMessage; oss << saneVerboseMessage.length() << " " << saneVerboseMessage;
oss << _callStack.size() << " "; oss << _callStack.size() << " ";
for (std::list<ErrorLogger::ErrorMessage::FileLocation>::const_iterator tok = _callStack.begin(); tok != _callStack.end(); ++tok) { for (std::list<ErrorLogger::ErrorMessage::FileLocation>::const_iterator loc = _callStack.begin(); loc != _callStack.end(); ++loc) {
std::ostringstream smallStream; std::ostringstream smallStream;
smallStream << (*tok).line << ":" << (*tok).getfile(); smallStream << (*loc).line << ':' << (*loc).getfile() << '\t' << loc->getinfo();
oss << smallStream.str().length() << " " << smallStream.str(); oss << smallStream.str().length() << " " << smallStream.str();
} }
@ -260,11 +260,19 @@ bool ErrorLogger::ErrorMessage::deserialize(const std::string &data)
const std::string::size_type colonPos = temp.find(':'); const std::string::size_type colonPos = temp.find(':');
if (colonPos == std::string::npos) if (colonPos == std::string::npos)
throw InternalError(0, "Internal Error: No colon found in <filename:line> pattern"); throw InternalError(0, "Internal Error: No colon found in <filename:line> pattern");
const std::string::size_type tabPos = temp.find('\t');
if (tabPos == std::string::npos)
throw InternalError(0, "Internal Error: No tab found in <filename:line> pattern");
const std::string tempinfo = temp.substr(tabPos + 1);
temp.erase(tabPos);
const std::string tempfile = temp.substr(colonPos + 1);
temp.erase(colonPos);
const std::string templine = temp;
ErrorLogger::ErrorMessage::FileLocation loc; ErrorLogger::ErrorMessage::FileLocation loc;
loc.setfile(temp.substr(colonPos + 1)); loc.setfile(tempfile);
temp = temp.substr(0, colonPos); loc.setinfo(tempinfo);
std::istringstream fiss(temp); std::istringstream fiss(templine);
fiss >> loc.line; fiss >> loc.line;
_callStack.push_back(loc); _callStack.push_back(loc);
@ -366,6 +374,8 @@ std::string ErrorLogger::ErrorMessage::toXML(bool verbose, int version) const
printer.PushAttribute("file0", Path::toNativeSeparators(file0).c_str()); printer.PushAttribute("file0", Path::toNativeSeparators(file0).c_str());
printer.PushAttribute("file", (*it).getfile().c_str()); printer.PushAttribute("file", (*it).getfile().c_str());
printer.PushAttribute("line", (*it).line); printer.PushAttribute("line", (*it).line);
if (!it->getinfo().empty())
printer.PushAttribute("info", it->getinfo().c_str());
printer.CloseElement(false); printer.CloseElement(false);
} }
printer.CloseElement(false); printer.CloseElement(false);

7
lib/errorlogger.h
View File

@ -193,6 +193,10 @@ public:
: line(aline), fileNumber(0), _file(file) { : line(aline), fileNumber(0), _file(file) {
} }
FileLocation(const std::string &file, const std::string &info, unsigned int aline)
: line(aline), fileNumber(0), _file(file), _info(info) {
}
FileLocation(const Token* tok, const TokenList* list); FileLocation(const Token* tok, const TokenList* list);
FileLocation(const Token* tok, const std::string &info, const TokenList* tokenList); FileLocation(const Token* tok, const std::string &info, const TokenList* tokenList);
@ -217,6 +221,9 @@ public:
unsigned int line; unsigned int line;
unsigned int fileNumber; unsigned int fileNumber;
std::string getinfo() const { return _info; }
void setinfo(const std::string &i) { _info = i; }
private: private:
std::string _file; std::string _file;
std::string _info; std::string _info;