replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc. cleanups to HTML printing: make code rendered using tables; add 

better div positioning for messages.

llvm-svn: 48555
This commit is contained in:
Ted Kremenek 2008-03-19 21:59:05 +00:00
parent 718da668ab
commit 1651b7cd2d
2 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clang/Driver/HTMLPrint.cpp
View File

@ -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\">&nbsp;</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());
}

49
clang/lib/Rewrite/HTMLRewrite.cpp
View File

@ -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());
}