[cfe-commits] r48572 - in /cfe/trunk: Driver/HTMLPrint.cpp lib/Rewrite/HTMLRewrite.cpp

Wed Mar 19 16:55:54 PDT 2008

Author: kremenek
Date: Wed Mar 19 18:55:53 2008
New Revision: 48572

URL: http://llvm.org/viewvc/llvm-project?rev=48572&view=rev
Log:
Added HTML highlighting for ranges.

Modified:
    cfe/trunk/Driver/HTMLPrint.cpp
    cfe/trunk/lib/Rewrite/HTMLRewrite.cpp

Modified: cfe/trunk/Driver/HTMLPrint.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/HTMLPrint.cpp?rev=48572&r1=48571&r2=48572&view=diff

==============================================================================

--- cfe/trunk/Driver/HTMLPrint.cpp (original)
+++ cfe/trunk/Driver/HTMLPrint.cpp Wed Mar 19 18:55:53 2008
@@ -154,10 +154,16 @@
   if (!Pos.isValid())
     return;  
   
+  SourceManager& SM = R.getSourceMgr();
+  
   FullSourceLoc LPos = Pos.getLogicalLoc();
   unsigned FileID = LPos.getLocation().getFileID();
   
-  if (FileID != LPos.getManager().getMainFileID())
+  assert (&LPos.getManager() == &SM && "SourceManagers are different!");
+  
+  unsigned MainFileID = SM.getMainFileID();
+  
+  if (FileID != MainFileID)
     return;
   
   
@@ -202,9 +208,33 @@
   
   // Insert the new html.
   
-  const llvm::MemoryBuffer *Buf = R.getSourceMgr().getBuffer(FileID);
+  const llvm::MemoryBuffer *Buf = SM.getBuffer(FileID);
   const char* FileStart = Buf->getBufferStart();
   
   R.InsertStrBefore(SourceLocation::getFileLoc(FileID, LineStart - FileStart),
                     os.str());
+  
+  // Now highlight the ranges.
+  
+  for (unsigned i = 0; i < NumRanges; ++i) {
+    
+    SourceLocation B = SM.getLogicalLoc(Ranges->getBegin());
+    SourceLocation E = SM.getLogicalLoc(Ranges->getEnd());
+    
+    // We do this because the position seems to point to the beginning of
+    // the last character.  FIXME: Is this what is suppose to happen?
+    std::pair<unsigned,unsigned> X = SM.getDecomposedFileLoc(E);
+    E = SourceLocation::getFileLoc(X.first, X.second+1);
+
+    ++Ranges;
+    
+    if (B.getFileID() != MainFileID || E.getFileID() != MainFileID)
+      continue;
+    
+    // Highlight the range.  Make the span tag the outermost tag for the
+    // selected range.
+    R.InsertCStrBefore(B, "<span class=\"mrange\">");
+    R.InsertCStrAfter(E, "</span>");
+  }
+  
 }

Modified: cfe/trunk/lib/Rewrite/HTMLRewrite.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/HTMLRewrite.cpp?rev=48572&r1=48571&r2=48572&view=diff

==============================================================================
--- cfe/trunk/lib/Rewrite/HTMLRewrite.cpp (original)
+++ cfe/trunk/lib/Rewrite/HTMLRewrite.cpp Wed Mar 19 18:55:53 2008
@@ -143,6 +143,7 @@
        << " .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"
+       << " .num { color:#444444 }\n"
        << " .line { padding-left: 1ex; border-left: 3px solid #ccc }\n"
        << " .line { white-space: pre }\n"
        << " .msg { background-color:#ff8000; color:#000000 }\n"
@@ -152,6 +153,8 @@
        << " .msg { float:left }\n"
        << " .msg { padding:0.5em 1ex 0.5em 1ex }\n"
        << " .msg { margin-top:10px; margin-bottom:10px }\n"
+       << " .mrange { color:#ff8000 }\n"
+       << " .mrange { border-bottom: 1px dotted #ff8000 }\n"
        << "</style>\n</head>\n<body>";
     
     R.InsertStrBefore(StartLoc, os.str());



