diff options
| author | Ted Kremenek <kremenek@apple.com> | 2008-03-19 21:59:05 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2008-03-19 21:59:05 +0000 |
| commit | e8e019ede11579bce271bee0b2b0b543bd9833a5 (patch) | |
| tree | 47eb40f689f6e7ce6a1dbd88daf640f29804464f | |
| parent | 1ab09f52be88641b7b780d0bcc29aae889313098 (diff) | |
Misc. cleanups to HTML printing: make code rendered using tables; add
better div positioning for messages.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@48555 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Driver/HTMLPrint.cpp | 22 | ||||
| -rw-r--r-- | lib/Rewrite/HTMLRewrite.cpp | 49 |
2 files changed, 31 insertions, 40 deletions
diff --git a/Driver/HTMLPrint.cpp b/Driver/HTMLPrint.cpp index 1108bc3bda..a6b90fafdf 100644 --- a/Driver/HTMLPrint.cpp +++ b/Driver/HTMLPrint.cpp @@ -179,19 +179,15 @@ void HTMLDiagnostic::HandleDiagnostic(Diagnostic &Diags, (StrNo < NumStrs ? Strs[StrNo] : "<<<INTERNAL ERROR>>>") + std::string(Msg.begin() + i + 2, Msg.end()); } - } - - // Start making the div tag. + } + + // Create the html for the message. std::ostringstream os; - os << "\n<div class=\"codeline\"><div class=\"nums\"> </div>" - << "<div class=\"lines\">"; - - for (unsigned i = 0; i < ColNo+1; ++i) - os << ' '; - - os << "</div><span class=\"msg\">"; + os << "\n<tr><td class=\"num\"></td><td class=\"line\">" + << "<div class=\"msg\" style=\"margin-left:" + << ColNo << "ex\">"; switch (DiagLevel) { default: assert(0 && "Unknown diagnostic type!"); @@ -202,15 +198,13 @@ void HTMLDiagnostic::HandleDiagnostic(Diagnostic &Diags, break; } - os << Msg; // FIXME: HTML escape "Msg" - os << "</span></div"; + os << Msg << "</div></td></tr>"; - // Insert a div tag with the warning. + // Insert the new html. const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FileID); const char* FileStart = Buf->getBufferStart(); - R.InsertStrBefore(SourceLocation::getFileLoc(FileID, LineStart - FileStart), os.str()); } diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp index dcbf181980..819dc20167 100644 --- a/lib/Rewrite/HTMLRewrite.cpp +++ b/lib/Rewrite/HTMLRewrite.cpp @@ -49,27 +49,27 @@ void html::EscapeText(Rewriter& R, unsigned FileID, bool EscapeSpaces) { static void AddLineNumber(Rewriter& R, unsigned LineNo, SourceLocation B, SourceLocation E) { - // Surround the line text with a div tag. + // Put the closing </tr> first. - R.InsertCStrBefore(E, "</div>"); + R.InsertCStrBefore(E, "</tr>"); if (B == E) // Handle empty lines. - R.InsertCStrBefore(B, "<div class=\"lines\"> </div>"); + R.InsertCStrBefore(B, "<td class=\"line\"> </td>"); else { - R.InsertCStrBefore(E, "</div>"); - R.InsertCStrBefore(B, "<div class=\"lines\">"); + R.InsertCStrBefore(E, "</td>"); + R.InsertCStrBefore(B, "<td class=\"line\">"); } // Insert a div tag for the line number. std::ostringstream os; - os << "<div class=\"nums\">" << LineNo << "</div>"; + os << "<td class=\"num\">" << LineNo << "</td>"; R.InsertStrBefore(B, os.str()); - // Now surround the whole line with another div tag. + // Now prepend the <tr>. - R.InsertCStrBefore(B, "<div class=\"codeline\">"); + R.InsertCStrBefore(B, "<tr>"); } @@ -115,10 +115,10 @@ void html::AddLineNumbers(Rewriter& R, unsigned FileID) { // Add one big div tag that surrounds all of the code. R.InsertCStrBefore(SourceLocation::getFileLoc(FileID, 0), - "<div id=\"codeblock\">"); + "<table class=\"code\">\n"); R.InsertCStrAfter(SourceLocation::getFileLoc(FileID, FileEnd - FileBeg), - "</div>"); + "</table>"); } void html::AddHeaderFooterInternalBuiltinCSS(Rewriter& R, unsigned FileID) { @@ -136,22 +136,19 @@ void html::AddHeaderFooterInternalBuiltinCSS(Rewriter& R, unsigned FileID) { std::ostringstream os; os << "<html>\n<head>\n" - << " <style type=\"text/css\">\n" - << " .codeblock { width:100% }\n" - << " .codeline { font-family: \"Andale Mono\", fixed; font-size:10pt }\n" - << " .codeline { height:1.5em; line-height:1.5em }\n" - << " .nums, .lines { float:left; height:100% }\n" - << " .nums { background-color: #eeeeee }\n" - << " .nums { font-size:smaller }\n" - << " .nums { width:2.5em; padding-right:2ex; text-align:right }\n" - << " .lines { padding-left: 1ex; border-left: 3px solid #ccc }\n" - << " .lines { white-space: pre }\n" - << " .msg { background-color:#fcff4c; float:left }\n" - << " .msg { font-family:Helvetica, sans-serif; font-size: smaller }\n" - << " .msg { padding:5px; margin-top:10px; margin-bottom:10px }\n" - << " </style>\n" - << "</head>\n" - << "<body>"; + << "<style type=\"text/css\">\n" + << " .code { border-spacing:0px; width:100%; }\n" + << " .code { font-family: \"Andale Mono\", fixed; font-size:10pt }\n" + << " .code { line-height: 1.2em }\n" + << " .num { width:2.5em; padding-right:2ex; background-color:#eeeeee }\n" + << " .num { text-align:right; font-size: smaller }\n" + << " .line { padding-left: 1ex; border-left: 3px solid #ccc }\n" + << " .line { white-space: pre }\n" + << " .msg { background-color:#fcff4c }\n" + << " .msg { font-family:Helvetica, sans-serif; font-size: smaller }\n" + << " .msg { float:left }\n" + << " .msg { padding:5px; margin-top:10px; margin-bottom:10px }\n" + << "</style>\n</head>\n<body>"; R.InsertStrBefore(StartLoc, os.str()); } |