From 3f958097632256329cdbaf2219e2ba15325e9c52 Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Wed, 11 Feb 2009 22:51:25 +0000
Subject: Hey, formatter, awesome, and look at that...I'm adding uuid support.

---
 src/formatter.cpp | 76 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 68 insertions(+), 8 deletions(-)

(limited to 'src/formatter.cpp')

diff --git a/src/formatter.cpp b/src/formatter.cpp
index c6ae3b7..1ec3c39 100644
--- a/src/formatter.cpp
+++ b/src/formatter.cpp
@@ -33,7 +33,7 @@ void Bu::Formatter::writeAligned( const Bu::FString &sStr )
 		{
 			case Fmt::Right:
 				for( int k = 0; k < iRem; k++ )
-					write(" ", 1 );
+					write( &fLast.cFillChar, 1 );
 				write( sStr );
 				break;
 			
@@ -41,18 +41,18 @@ void Bu::Formatter::writeAligned( const Bu::FString &sStr )
 				{
 					int iHlf = iRem/2;
 					for( int k = 0; k < iHlf; k++ )
-						write(" ", 1 );
+						write( &fLast.cFillChar, 1 );
 					write( sStr );
 					iHlf = iRem-iHlf;;
 					for( int k = 0; k < iHlf; k++ )
-						write(" ", 1 );
+						write( &fLast.cFillChar, 1 );
 				}
 				break;
 			
 			case Fmt::Left:
 				write( sStr );
 				for( int k = 0; k < iRem; k++ )
-					write(" ", 1 );
+					write( &fLast.cFillChar, 1 );
 				break;
 		}
 	}
@@ -73,7 +73,7 @@ void Bu::Formatter::writeAligned( const char *sStr, int iLen )
 		{
 			case Fmt::Right:
 				for( int k = 0; k < iRem; k++ )
-					write(" ", 1 );
+					write( &fLast.cFillChar, 1 );
 				write( sStr, iLen );
 				break;
 			
@@ -81,18 +81,18 @@ void Bu::Formatter::writeAligned( const char *sStr, int iLen )
 				{
 					int iHlf = iRem/2;
 					for( int k = 0; k < iHlf; k++ )
-						write(" ", 1 );
+						write( &fLast.cFillChar, 1 );
 					write( sStr, iLen );
 					iHlf = iRem-iHlf;;
 					for( int k = 0; k < iHlf; k++ )
-						write(" ", 1 );
+						write( &fLast.cFillChar, 1 );
 				}
 				break;
 			
 			case Fmt::Left:
 				write( sStr, iLen );
 				for( int k = 0; k < iRem; k++ )
-					write(" ", 1 );
+					write( &fLast.cFillChar, 1 );
 				break;
 		}
 	}
@@ -100,6 +100,42 @@ void Bu::Formatter::writeAligned( const char *sStr, int iLen )
 	usedFormat();
 }
 
+Bu::Formatter::Fmt &Bu::Formatter::Fmt::width( unsigned int uWidth )
+{
+	this->uMinWidth = uWidth;
+	return *this;
+}
+
+Bu::Formatter::Fmt &Bu::Formatter::Fmt::fill( char cFill )
+{
+	this->cFillChar = (unsigned char)cFill;
+	return *this;
+}
+
+Bu::Formatter::Fmt &Bu::Formatter::Fmt::radix( unsigned int uRadix )
+{
+	this->uRadix = uRadix;
+	return *this;
+}
+
+Bu::Formatter::Fmt &Bu::Formatter::Fmt::align( Alignment eAlign )
+{
+	this->uAlign = eAlign;
+	return *this;
+}
+
+Bu::Formatter::Fmt &Bu::Formatter::Fmt::plus( bool bPlus )
+{
+	this->bPlus = bPlus;
+	return *this;
+}
+
+Bu::Formatter::Fmt &Bu::Formatter::Fmt::caps( bool bCaps )
+{
+	this->bCaps = bCaps;
+	return *this;
+}
+
 Bu::Formatter &Bu::operator<<( Bu::Formatter &rOut, const Bu::Formatter::Fmt &f )
 {
 	rOut.setTempFormat( f );
@@ -195,3 +231,27 @@ Bu::Formatter &Bu::operator<<( Bu::Formatter &rOut, unsigned long long i )
 	return rOut;
 }
 
+Bu::Formatter &Bu::operator<<( Bu::Formatter &rOut, float f )
+{
+	rOut.ffmt<float>( f );
+	return rOut;
+}
+
+Bu::Formatter &Bu::operator<<( Bu::Formatter &rOut, double f )
+{
+	rOut.ffmt<double>( f );
+	return rOut;
+}
+
+Bu::Formatter &Bu::operator<<( Bu::Formatter &rOut, long double f )
+{
+	rOut.ffmt<long double>( f );
+	return rOut;
+}
+
+Bu::Formatter &Bu::operator<<( Bu::Formatter &rOut, bool b )
+{
+	rOut.writeAligned( b?("true"):("false") );
+	return rOut;
+}
+
-- 
cgit v1.2.3