Add `f` formats to `ifmt!`

Currently the work just the same as the old `extfmt` versions

3 files changed, 54 insertions, 12 deletions

diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs
index f90e7d5084a..41e588934b7 100644
--- a/src/libstd/fmt/mod.rs
+++ b/src/libstd/fmt/mod.rs
@@ -122,6 +122,7 @@ The current mapping of types to traits is:
 * `s` => String
 * `p` => Pointer
 * `t` => Binary
+* `f` => Float
 
 What this means is that any type of argument which implements the
 `std::fmt::Binary` trait can then be formatted with `{:t}`. Implementations are
@@ -377,6 +378,8 @@ pub trait String { fn fmt(&Self, &mut Formatter); }
 pub trait Poly { fn fmt(&Self, &mut Formatter); }
 #[allow(missing_doc)]
 pub trait Pointer { fn fmt(&Self, &mut Formatter); }
+#[allow(missing_doc)]
+pub trait Float { fn fmt(&Self, &mut Formatter); }
 
 /// The sprintf function takes a precompiled format string and a list of
 /// arguments, to return the resulting formatted string.
@@ -549,7 +552,20 @@ impl<'self> Formatter<'self> {
     // Helper methods used for padding and processing formatting arguments that
     // all formatting traits can use.
 
-    /// TODO: dox
+    /// Performs the correct padding for an integer which has already been
+    /// emitted into a byte-array. The byte-array should *not* contain the sign
+    /// for the integer, that will be added by this method.
+    ///
+    /// # Arguments
+    ///
+    ///     * s - the byte array that the number has been formatted into
+    ///     * alternate_prefix - if the '#' character (FlagAlternate) is
+    ///       provided, this is the prefix to put in front of the number.
+    ///       Currently this is 0x/0o/0b/etc.
+    ///     * positive - whether the original integer was positive or not.
+    ///
+    /// This function will correctly account for the flags provided as well as
+    /// the minimum width. It will not take precision into account.
     pub fn pad_integral(&mut self, s: &[u8], alternate_prefix: &str,
                         positive: bool) {
         use fmt::parse::{FlagAlternate, FlagSignPlus, FlagSignAwareZeroPad};
@@ -791,6 +807,22 @@ integer!(i16, u16)
 integer!(i32, u32)
 integer!(i64, u64)
 
+macro_rules! floating(($ty:ident) => {
+    impl Float for $ty {
+        fn fmt(f: &$ty, fmt: &mut Formatter) {
+            // XXX: this shouldn't perform an allocation
+            let s = match fmt.precision {
+                Some(i) => ::$ty::to_str_exact(f.abs(), i),
+                None => ::$ty::to_str_digits(f.abs(), 6)
+            };
+            fmt.pad_integral(s.as_bytes(), "", *f >= 0.0);
+        }
+    }
+})
+floating!(float)
+floating!(f32)
+floating!(f64)
+
 impl<T> Poly for T {
     fn fmt(t: &T, f: &mut Formatter) {
         match (f.width, f.precision) {
diff --git a/src/libsyntax/ext/ifmt.rs b/src/libsyntax/ext/ifmt.rs
index 2d839f652d5..6999f046b7b 100644
--- a/src/libsyntax/ext/ifmt.rs
+++ b/src/libsyntax/ext/ifmt.rs
@@ -637,16 +637,17 @@ impl Context {
             Known(tyname) => {
                 let fmt_trait = match tyname.as_slice() {
                     "?" => "Poly",
-                    "d" | "i" => "Signed",
-                    "u" => "Unsigned",
                     "b" => "Bool",
                     "c" => "Char",
+                    "d" | "i" => "Signed",
+                    "f" => "Float",
                     "o" => "Octal",
-                    "x" => "LowerHex",
-                    "X" => "UpperHex",
-                    "s" => "String",
                     "p" => "Pointer",
+                    "s" => "String",
                     "t" => "Binary",
+                    "u" => "Unsigned",
+                    "x" => "LowerHex",
+                    "X" => "UpperHex",
                     _ => {
                         self.ecx.span_err(sp, fmt!("unknown format trait \
                                                     `%s`", tyname));
diff --git a/src/test/run-pass/ifmt.rs b/src/test/run-pass/ifmt.rs
index 55dc6bd2407..a0d3eb7d803 100644
--- a/src/test/run-pass/ifmt.rs
+++ b/src/test/run-pass/ifmt.rs
@@ -172,11 +172,20 @@ pub fn main() {
     t!(ifmt!("{:#o}", -1u8), "0o377");
 
     // Signed combinations
-    t!(ifmt!("{:+5d}", 1),  ~"   +1");
-    t!(ifmt!("{:+5d}", -1), ~"   -1");
-    t!(ifmt!("{:05d}", 1),    ~"00001");
-    t!(ifmt!("{:05d}", -1),   ~"-0001");
-    t!(ifmt!("{:+05d}", 1),   ~"+0001");
-    t!(ifmt!("{:+05d}", -1),  ~"-0001");
+    t!(ifmt!("{:+5d}", 1),  "   +1");
+    t!(ifmt!("{:+5d}", -1), "   -1");
+    t!(ifmt!("{:05d}", 1),   "00001");
+    t!(ifmt!("{:05d}", -1),  "-0001");
+    t!(ifmt!("{:+05d}", 1),  "+0001");
+    t!(ifmt!("{:+05d}", -1), "-0001");
+
+    // Some float stuff
+    t!(ifmt!("{:f}", 1.0f), "1");
+    t!(ifmt!("{:f}", 1.0f32), "1");
+    t!(ifmt!("{:f}", 1.0f64), "1");
+    t!(ifmt!("{:.3f}", 1.0f), "1.000");
+    t!(ifmt!("{:10.3f}", 1.0f),   "     1.000");
+    t!(ifmt!("{:+10.3f}", 1.0f),  "    +1.000");
+    t!(ifmt!("{:+10.3f}", -1.0f), "    -1.000");
 }