X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FFormattedStream.cpp;h=618ec2673a1696b899e4fa3ca9138bf9c40ad422;hb=55dd199bd3f86b7a89497545f0d09ca115b9872a;hp=d471d53df8397f4e772130843b7154dfddfad226;hpb=62fe47a33755719ab9c6e8c239e0dd01fc87e6f9;p=oota-llvm.git

diff --git a/lib/Support/FormattedStream.cpp b/lib/Support/FormattedStream.cpp
index d471d53df83..618ec2673a1 100644
--- a/lib/Support/FormattedStream.cpp
+++ b/lib/Support/FormattedStream.cpp
@@ -1,74 +1,106 @@
-//===-- llvm/CodeGen/AsmStream.cpp - AsmStream Framework --------*- C++ -*-===//
+//===-- llvm/Support/FormattedStream.cpp - Formatted streams ----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains instantiations of "standard" AsmOStreams.
+// This file contains the implementation of formatted_raw_ostream.
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/FormattedStream.h"
+#include <algorithm>
 
-namespace llvm {
-  /// ComputeColumn - Examine the current output and figure out which
-  /// column we end up in after output.
-  ///
-  void formatted_raw_ostream::ComputeColumn(const char *Ptr, unsigned Size)
-  {
-    // Keep track of the current column by scanning the string for
-    // special characters
+using namespace llvm;
 
-    // Find the last newline.  This is our column start.  If there
-    // is no newline, start with the current column.
-    const char *nlpos = NULL;
-    for (const char *pos = Ptr + Size, *epos = Ptr; pos > epos; --pos) {
-      if (*(pos-1) == '\n') {
-        nlpos = pos-1;
-        // The newline will be counted, setting this to zero.  We
-        // need to do it this way in case nlpos is Ptr.
-        Column = -1;
-        break;
-      }
-    }
-
-    if (nlpos == NULL) {
-      nlpos = Ptr;
-    }
+/// UpdatePosition - Examine the given char sequence and figure out which
+/// column we end up in after output, and how many line breaks are contained.
+///
+static void UpdatePosition(std::pair<unsigned, unsigned> &Position, const char *Ptr, size_t Size) {
+  unsigned &Column = Position.first;
+  unsigned &Line = Position.second;
 
-    // Walk through looking for tabs and advance column as appropriate
-    for (const char *pos = nlpos, *epos = Ptr + Size; pos != epos; ++pos) {
-      ++Column;
-      if (*pos == '\t') {
-        // Advance to next tab stop (every eight characters)
-        Column += ((8 - (Column & 0x7)) & 0x7);
-        assert(!(Column & 0x3) && "Column out of alignment");
-      }
+  // 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.
+      Column += (8 - (Column & 0x7)) & 0x7;
+      break;
     }
   }
+}
 
-  /// 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) 
-  {
-    flush();
+/// 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);
 
-    // Output spaces until we reach the desired column
-    unsigned num = NewCol - Column;
-    if (NewCol < Column || num < MinPad) {
-      num = MinPad;
-    }
+  // Update the scanning pointer.
+  Scanned = Ptr + Size;
+}
 
-    // TODO: Write a whole string at a time
-    while (num-- > 0) {
-      write(' ');
-    }
-  }
+/// PadToColumn - Align the output to some column number.
+///
+/// \param NewCol - The column to move to.
+///
+formatted_raw_ostream &formatted_raw_ostream::PadToColumn(unsigned NewCol) { 
+  // Figure out what's in the buffer and add it to the column count.
+  ComputePosition(getBufferStart(), GetNumBytesInBuffer());
+
+  // Output spaces until we reach the desired column.
+  indent(std::max(int(NewCol - getColumn()), 1));
+  return *this;
+}
+
+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);
+
+  // Write the data to the underlying stream (which is unbuffered, so
+  // the data will be immediately written out).
+  TheStream->write(Ptr, Size);
+
+  // Reset the scanning pointer.
+  Scanned = nullptr;
+}
+
+/// fouts() - This returns a reference to a formatted_raw_ostream for
+/// standard output.  Use it like: fouts() << "foo" << "bar";
+formatted_raw_ostream &llvm::fouts() {
+  static formatted_raw_ostream S(outs());
+  return S;
+}
+
+/// ferrs() - This returns a reference to a formatted_raw_ostream for
+/// standard error.  Use it like: ferrs() << "foo" << "bar";
+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;
 }