X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FFormattedStream.cpp;h=9febf664f2bef156b2a52dcd04b0a65d0cb3088e;hb=9bcad42c3aadab118b6ed5f30f2ea0d87228fd3f;hp=7f8adfc3d744f4552e44fac6311c767d61ed4b15;hpb=1486ef96ed8eb364467f5261887514114af1e39e;p=oota-llvm.git

diff --git a/lib/Support/FormattedStream.cpp b/lib/Support/FormattedStream.cpp
index 7f8adfc3d74..9febf664f2b 100644
--- a/lib/Support/FormattedStream.cpp
+++ b/lib/Support/FormattedStream.cpp
@@ -11,55 +11,77 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/FormattedStream.h"
+#include <algorithm>
 
 using namespace llvm;
 
-/// ComputeColumn - Examine the current output and figure out which
-/// column we end up in after output.
+/// UpdatePosition - Examine the given char sequence and figure out which
+/// column we end up in after output, and how many line breaks are contained.
 ///
-void formatted_raw_ostream::ComputeColumn() {
-  // Keep track of the current column by scanning the string for
-  // special characters
-
-  // The buffer may have been allocated underneath us.
-  if (Scanned == 0 && GetNumBytesInBuffer() != 0) {
-    Scanned = begin();
-  }
+static void UpdatePosition(std::pair<unsigned, unsigned> &Position, const char *Ptr, size_t Size) {
+  unsigned &Column = Position.first;
+  unsigned &Line = Position.second;
 
-  while (Scanned != end()) {
-    ++ColumnScanned;
-    if (*Scanned == '\n' || *Scanned == '\r')
-      ColumnScanned = 0;
-    else if (*Scanned == '\t')
+  // Keep track of the current column and line by scanning the string for
+  // special characters
+  for (const char *End = Ptr + Size; Ptr != End; ++Ptr) {
+    ++Column;
+    switch (*Ptr) {
+    case '\n':
+      Line += 1;
+    case '\r':
+      Column = 0;
+      break;
+    case '\t':
       // Assumes tab stop = 8 characters.
-      ColumnScanned += (8 - (ColumnScanned & 0x7)) & 0x7;
-    ++Scanned;
+      Column += (8 - (Column & 0x7)) & 0x7;
+      break;
+    }
   }
 }
 
+/// ComputePosition - Examine the current output and update line and column
+/// counts.
+void formatted_raw_ostream::ComputePosition(const char *Ptr, size_t Size) {
+  // If our previous scan pointer is inside the buffer, assume we already
+  // scanned those bytes. This depends on raw_ostream to not change our buffer
+  // in unexpected ways.
+  if (Ptr <= Scanned && Scanned <= Ptr + Size)
+    // Scan all characters added since our last scan to determine the new
+    // column.
+    UpdatePosition(Position, Scanned, Size - (Scanned - Ptr));
+  else
+    UpdatePosition(Position, Ptr, Size);
+
+  // Update the scanning pointer.
+  Scanned = Ptr + Size;
+}
+
 /// PadToColumn - Align the output to some column number.
 ///
 /// \param NewCol - The column to move to.
-/// \param MinPad - The minimum space to give after the most recent
-/// I/O, even if the current column + minpad > newcol.
 ///
-void formatted_raw_ostream::PadToColumn(unsigned NewCol, unsigned MinPad) { 
+formatted_raw_ostream &formatted_raw_ostream::PadToColumn(unsigned NewCol) { 
   // Figure out what's in the buffer and add it to the column count.
-  ComputeColumn();
+  ComputePosition(getBufferStart(), GetNumBytesInBuffer());
 
   // Output spaces until we reach the desired column.
-  unsigned num = NewCol - ColumnScanned;
-  if (NewCol < ColumnScanned || num < MinPad)
-    num = MinPad;
+  indent(std::max(int(NewCol - getColumn()), 1));
+  return *this;
+}
 
-  // Keep a buffer of spaces handy to speed up processing.
-  const char *Spaces = "                                                      "
-    "                                                                         ";
+void formatted_raw_ostream::write_impl(const char *Ptr, size_t Size) {
+  // Figure out what's in the buffer and add it to the column count.
+  ComputePosition(Ptr, Size);
 
-  assert(num < MAX_COLUMN_PAD && "Unexpectedly large column padding");
+  // Write the data to the underlying stream (which is unbuffered, so
+  // the data will be immediately written out).
+  TheStream->write(Ptr, Size);
 
-  write(Spaces, num);
+  // Reset the scanning pointer.
+  Scanned = 0;
 }
 
 /// fouts() - This returns a reference to a formatted_raw_ostream for
@@ -75,3 +97,10 @@ formatted_raw_ostream &llvm::ferrs() {
   static formatted_raw_ostream S(errs());
   return S;
 }
+
+/// fdbgs() - This returns a reference to a formatted_raw_ostream for
+/// the debug stream.  Use it like: fdbgs() << "foo" << "bar";
+formatted_raw_ostream &llvm::fdbgs() {
+  static formatted_raw_ostream S(dbgs());
+  return S;
+}