Make some more changes suggested by Chris. Manipulators go away.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75472 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 10 insertions, 104 deletions

diff --git a/include/llvm/CodeGen/AsmFormatter.h b/include/llvm/CodeGen/AsmFormatter.h
deleted file mode 100644
index 7d446bc..0000000
--- a/include/llvm/CodeGen/AsmFormatter.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//===-- llvm/CodeGen/AsmFormatter.h - Formatted asm framework ---*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains various I/O manipulators to pretty-print asm.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Support/FormattedStream.h"
-#include "llvm/Target/TargetAsmInfo.h"
-
-namespace llvm 
-{
-  /// AsmComment - An I/O manipulator to output an end-of-line comment
-  ///
-  class AsmComment : public Column {
-  private:
-    /// CommentColumn - The column at which to output a comment
-    ///
-    static const int CommentColumn = 60;
-    /// Text - The comment to output
-    ///
-    std::string Text;
-    /// TAI - Target information from the code generator
-    ///
-    const TargetAsmInfo &TAI;
-    
-  public:
-    AsmComment(const TargetAsmInfo &T) 
-        : Column(CommentColumn), Text(""), TAI(T) {}
-
-    AsmComment(const std::string &Cmnt,
-            const TargetAsmInfo &T) 
-        : Column(CommentColumn), Text(Cmnt), TAI(T) {}
-
-    /// operator() - Store a comments tring for later processing.
-    ///
-    AsmComment &operator()(const std::string &Cmnt) {
-      Text = Cmnt;
-      return *this;
-    }
-
-    /// operator() - Make Comment a functor invoktable by a stream
-    /// output operator.  This intentially hides Column's operator().
-    ///
-    formatted_raw_ostream &operator()(formatted_raw_ostream &Out) const {
-      Column::operator()(Out);
-      Out << TAI.getCommentString() << " " << Text;
-      return(Out);
-    }
-  };
-
-  /// operator<< - Support comment formatting in formatted streams.
-  ///
-  inline formatted_raw_ostream &operator<<(formatted_raw_ostream &Out,
-                                           const AsmComment &Func)
-  {
-    return(Func(Out));
-  }
-}
diff --git a/include/llvm/Support/FormattedStream.h b/include/llvm/Support/FormattedStream.h
index fb8aa35..2cead0a 100644
--- a/include/llvm/Support/FormattedStream.h
+++ b/include/llvm/Support/FormattedStream.h
@@ -12,23 +12,24 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_ASMSTREAM_H
-#define LLVM_CODEGEN_ASMSTREAM_H
+#ifndef LLVM_SUPPORT_FORMATTEDSTREAM_H
+#define LLVM_SUPPORT_FORMATTEDSTREAM_H
 
 #include "llvm/Support/raw_ostream.h"
 
 namespace llvm 
 {
-  /// raw_asm_fd_ostream - Formatted raw_fd_ostream to handle
-  /// asm-specific constructs
+  /// formatted_raw_ostream - Formatted raw_fd_ostream to handle
+  /// asm-specific constructs.
   ///
   class formatted_raw_ostream : public raw_ostream {
   private:
-    /// TheStream - The real stream we output to
+    /// TheStream - The real stream we output to.
     ///
     raw_ostream &TheStream;
 
-    /// Column - The current output column of the stream
+    /// Column - The current output column of the stream.  The column
+    /// scheme is zero-based.
     ///
     unsigned Column;
 
@@ -63,44 +64,14 @@ namespace llvm
     formatted_raw_ostream(raw_ostream &Stream) 
         : raw_ostream(), TheStream(Stream), Column(0) {}
 
-    /// PadToColumn - Align the output to some column number
+    /// PadToColumn - Align the output to some column number.
     ///
-    /// \param NewCol - The column to move to
+    /// \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
+    /// recent I/O, even if the current column + minpad > newcol.
     ///
     void PadToColumn(unsigned NewCol, unsigned MinPad = 0);
   };
-
-  /// Column - An I/O manipulator to advance the output to a certain column
-  ///
-  class Column {
-  private:
-    /// Col - The column to move to
-    ///
-    unsigned int Col;
-
-  public:
-    explicit Column(unsigned int c) 
-        : Col(c) {}
-
-    /// operator() - Make Column a functor invokable by a stream
-    /// output operator.
-    ///
-    formatted_raw_ostream &operator()(formatted_raw_ostream &Out) const {
-      // Make at least one space before the next output
-      Out.PadToColumn(Col, 1);
-      return(Out);
-    }
-  };
-
-  /// operator<< - Support coulmn-setting in formatted streams.
-  ///
-  inline formatted_raw_ostream &operator<<(formatted_raw_ostream &Out,
-                                           const Column &Func)
-  {
-    return(Func(Out));
-  }
 }
 
 #endif