1 files changed, 70 insertions, 7 deletions

diff --git a/include/llvm/Support/Format.h b/include/llvm/Support/Format.h
index b713cc7..8e163dd 100644
--- a/include/llvm/Support/Format.h
+++ b/include/llvm/Support/Format.h
@@ -23,6 +23,9 @@
 #ifndef LLVM_SUPPORT_FORMAT_H
 #define LLVM_SUPPORT_FORMAT_H
 
+#include "llvm/ADT/StringRef.h"
+#include "llvm/Support/DataTypes.h"
+
 #include <cassert>
 #include <cstdio>
 #ifdef _MSC_VER
@@ -41,6 +44,7 @@ namespace llvm {
 class format_object_base {
 protected:
   const char *Fmt;
+  ~format_object_base() {} // Disallow polymorphic deletion.
   virtual void home(); // Out of line virtual method.
 
   /// Call snprintf() for this object, on the given buffer and size.
@@ -48,7 +52,6 @@ protected:
 
 public:
   format_object_base(const char *fmt) : Fmt(fmt) {}
-  virtual ~format_object_base() {}
 
   /// Format the object into the specified buffer.  On success, this returns
   /// the length of the formatted string.  If the buffer is too small, this
@@ -79,7 +82,7 @@ public:
 /// returns whether or not it is big enough.
 
 template <typename T>
-class format_object1 : public format_object_base {
+class format_object1 final : public format_object_base {
   T Val;
 public:
   format_object1(const char *fmt, const T &val)
@@ -92,7 +95,7 @@ public:
 };
 
 template <typename T1, typename T2>
-class format_object2 : public format_object_base {
+class format_object2 final : public format_object_base {
   T1 Val1;
   T2 Val2;
 public:
@@ -106,7 +109,7 @@ public:
 };
 
 template <typename T1, typename T2, typename T3>
-class format_object3 : public format_object_base {
+class format_object3 final : public format_object_base {
   T1 Val1;
   T2 Val2;
   T3 Val3;
@@ -121,7 +124,7 @@ public:
 };
 
 template <typename T1, typename T2, typename T3, typename T4>
-class format_object4 : public format_object_base {
+class format_object4 final : public format_object_base {
   T1 Val1;
   T2 Val2;
   T3 Val3;
@@ -138,7 +141,7 @@ public:
 };
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
-class format_object5 : public format_object_base {
+class format_object5 final : public format_object_base {
   T1 Val1;
   T2 Val2;
   T3 Val3;
@@ -158,7 +161,7 @@ public:
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5,
           typename T6>
-class format_object6 : public format_object_base {
+class format_object6 final : public format_object_base {
   T1 Val1;
   T2 Val2;
   T3 Val3;
@@ -225,6 +228,66 @@ format(const char *Fmt, const T1 &Val1, const T2 &Val2, const T3 &Val3,
                                                 Val5, Val6);
 }
 
+/// This is a helper class used for left_justify() and right_justify().
+class FormattedString {
+  StringRef Str;
+  unsigned Width;
+  bool RightJustify;
+  friend class raw_ostream;
+public:
+    FormattedString(StringRef S, unsigned W, bool R)
+      : Str(S), Width(W), RightJustify(R) { }
+};
+
+/// left_justify - append spaces after string so total output is
+/// \p Width characters.  If \p Str is larger that \p Width, full string
+/// is written with no padding.
+inline FormattedString left_justify(StringRef Str, unsigned Width) {
+  return FormattedString(Str, Width, false);
+}
+
+/// right_justify - add spaces before string so total output is
+/// \p Width characters.  If \p Str is larger that \p Width, full string
+/// is written with no padding.
+inline FormattedString right_justify(StringRef Str, unsigned Width) {
+  return FormattedString(Str, Width, true);
+}
+
+/// This is a helper class used for format_hex() and format_decimal().
+class FormattedNumber {
+  uint64_t HexValue;
+  int64_t DecValue;
+  unsigned Width;
+  bool Hex;
+  bool Upper;
+  friend class raw_ostream;
+public:
+    FormattedNumber(uint64_t HV, int64_t DV, unsigned W, bool H, bool U)
+      : HexValue(HV), DecValue(DV), Width(W), Hex(H), Upper(U) { }
+};
+
+/// format_hex - Output \p N as a fixed width hexadecimal. If number will not
+/// fit in width, full number is still printed.  Examples:
+///   OS << format_hex(255, 4)        => 0xff
+///   OS << format_hex(255, 4, true)  => 0xFF
+///   OS << format_hex(255, 6)        => 0x00ff
+///   OS << format_hex(255, 2)        => 0xff
+inline FormattedNumber format_hex(uint64_t N, unsigned Width, bool Upper=false) {
+  assert(Width <= 18 && "hex width must be <= 18");
+  return FormattedNumber(N, 0, Width, true, Upper);
+}
+
+/// format_decimal - Output \p N as a right justified, fixed-width decimal. If 
+/// number will not fit in width, full number is still printed.  Examples:
+///   OS << format_decimal(0, 5)     => "    0"
+///   OS << format_decimal(255, 5)   => "  255"
+///   OS << format_decimal(-1, 3)    => " -1"
+///   OS << format_decimal(12345, 3) => "12345"
+inline FormattedNumber format_decimal(int64_t N, unsigned Width) {
+  return FormattedNumber(0, N, Width, false, false);
+}
+
+
 } // end namespace llvm
 
 #endif