Fronted/CC_LOG_DIAGNOSTICS: Tweak output form to be plist chunks, and don't
output missing data.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129093 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/LogDiagnosticPrinter.cpp b/lib/Frontend/LogDiagnosticPrinter.cpp
index ca661a6..9eee843 100644
--- a/lib/Frontend/LogDiagnosticPrinter.cpp
+++ b/lib/Frontend/LogDiagnosticPrinter.cpp
@@ -52,23 +52,37 @@
llvm::SmallString<512> Msg;
llvm::raw_svector_ostream OS(Msg);
- OS << "{\n";
+ OS << "<dict>\n";
// FIXME: Output main translation unit file name.
// FIXME: Include the invocation, if dwarf-debug-flags is available.
- OS << " \"diagnostics\" : [\n";
+ OS << " <key>diagnostics</key>\n";
+ OS << " <array>\n";
for (unsigned i = 0, e = Entries.size(); i != e; ++i) {
DiagEntry &DE = Entries[i];
- OS << " {\n";
- OS << " \"filename\" : \"" << DE.Filename << "\",\n";
- OS << " \"line\" : " << DE.Line << ",\n";
- OS << " \"column\" : " << DE.Column << ",\n";
- OS << " \"message\" : \"" << DE.Message << "\",\n";
- OS << " \"level\" : \"" << getLevelName(DE.DiagnosticLevel) << "\"\n";
- OS << " }" << ((i + 1 != e) ? "," : "") << '\n';
+ OS << " <dict>\n";
+ OS << " <key>level</key>\n"
+ << " <string>" << getLevelName(DE.DiagnosticLevel) << "</string>\n";
+ if (!DE.Filename.empty()) {
+ OS << " <key>filename</key>\n"
+ << " <string>" << DE.Filename << "</string>\n";
+ }
+ if (DE.Line != 0) {
+ OS << " <key>line</key>\n"
+ << " <integer>" << DE.Line << "</integer>\n";
+ }
+ if (DE.Column != 0) {
+ OS << " <key>column</key>\n"
+ << " <integer>" << DE.Column << "</integer>\n";
+ }
+ if (!DE.Message.empty()) {
+ OS << " <key>message</key>\n"
+ << " <string>" << DE.Message << "</string>\n";
+ }
+ OS << " </dict>\n";
}
- OS << " ]\n";
- OS << "},\n";
+ OS << " </array>\n";
+ OS << "</dict>\n";
this->OS << OS.str();
}