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

xml dump: fixed some minor issues in symboldatabase dump

This commit is contained in:
Daniel Marjamäki 2014-07-14 19:25:30 +02:00
parent 84ec573d0a
commit 2f7b8fe4b2
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/symboldatabase.cpp
View File

@ -2074,6 +2074,32 @@ void SymbolDatabase::printOut(const char *title) const
} }
} }
static std::string toxml(const std::string &str)
{
std::ostringstream xml;
for (std::size_t i = 0U; i < str.length(); i++) {
char c = str[i];
switch (c) {
case '<':
xml << "&lt;";
break;
case '>':
xml << "&gt;";
break;
case '&':
xml << "&amp;";
break;
case '\"':
xml << "&quot;";
break;
default:
xml << c;
break;
}
}
return xml.str();
}
void SymbolDatabase::printXml(std::ostream &out) const void SymbolDatabase::printXml(std::ostream &out) const
{ {
// Scopes.. // Scopes..
@ -2083,7 +2109,7 @@ void SymbolDatabase::printXml(std::ostream &out) const
out << " id=\"" << &*scope << "\""; out << " id=\"" << &*scope << "\"";
out << " type=\"" << scope->type << "\""; out << " type=\"" << scope->type << "\"";
if (!scope->className.empty()) if (!scope->className.empty())
out << " className=\"" << scope->className << "\""; out << " className=\"" << toxml(scope->className) << "\"";
if (scope->nestedIn) if (scope->nestedIn)
out << " nestedIn=\"" << scope->nestedIn << "\""; out << " nestedIn=\"" << scope->nestedIn << "\"";
if (scope->functionList.empty() && scope->varlist.empty()) { if (scope->functionList.empty() && scope->varlist.empty()) {
@ -2107,14 +2133,14 @@ void SymbolDatabase::printXml(std::ostream &out) const
} }
out << " </functionList>" << std::endl; out << " </functionList>" << std::endl;
} }
if (!scope->varlist.empty()) {
out << " <varlist>" << std::endl;
for (std::list<Variable>::const_iterator var = scope->varlist.begin(); var != scope->varlist.end(); ++var)
out << " <var id=\"" << &*var << "\"/>" << std::endl;
out << " </varlist>" << std::endl;
}
out << " </scope>" << std::endl;
} }
if (!scope->varlist.empty()) {
out << " <varlist>" << std::endl;
for (std::list<Variable>::const_iterator var = scope->varlist.begin(); var != scope->varlist.end(); ++var)
out << " <var id=\"" << &*var << "\"/>" << std::endl;
out << " </varlist>" << std::endl;
}
out << " </scope>" << std::endl;
} }
out << " </scopes>" << std::endl; out << " </scopes>" << std::endl;