Merge pull request #62 from JuliaString/spj/fixpoint

Don't print decimal point when unnecessary: formatting PR #101

Author: ScottPJones

src/fmtcore.jl

@@ -147,10 +147,9 @@ function _pfmt_float(out::IO, sch::AbstractChar, zs::Integer, intv::Real, decv::
     else
         _pfmt_intdigits(out, intv, _Dec())
     end
-    # print decimal point
-    print(out, '.')
     # print decimal part
     if prec > 0
+        print(out, '.')
         nd = _ndigits(idecv, _Dec())
         nd < prec && _repprint(out, '0', prec - nd)
         _pfmt_intdigits(out, idecv, _Dec())
@@ -165,7 +164,7 @@ function _pfmt_f(out::IO, fs::FormatSpec, x::AbstractFloat)
     decv = rax - intv
 
     # calculate length
-    xlen = _ndigits(intv, _Dec()) + 1 + fs.prec
+    xlen = _ndigits(intv, _Dec()) + ifelse(fs.prec > 0, fs.prec + 1, 0)
     sch != '\0' && (xlen += 1)
 
     # print

test/fmtspec.jl

@@ -149,6 +149,7 @@ end
     @test pyfmt("8.2f", -8.376) == "   -8.38"
     @test pyfmt("<8.2f", -8.376) == "-8.38   "
     @test pyfmt(">8.2f", -8.376) == "   -8.38"
+    @test pyfmt(".0f", 8.376) == "8"
 
     @test pyfmt("<08.2f", 8.376) == "00008.38"
     @test pyfmt(">08.2f", 8.376) == "00008.38"
@@ -201,6 +202,10 @@ end
     @test pyfmt(".1e", 0.6) == "6.0e-01"
     @test pyfmt(".1e", 0.9) == "9.0e-01"
 
+    # issue #61 (from Formatting.jl)
+    @test pyfmt("1.0e", 1e-21) == "1e-21"
+    @test pyfmt("1.1e", 1e-21) == "1.0e-21"
+
     @test pyfmt("10.2e", 1.2e100) == " 1.20e+100"
     @test pyfmt("11.2e", BigFloat("1.2e1000")) == " 1.20e+1000"
     @test pyfmt("11.2e", BigFloat("1.2e-1000")) == " 1.20e-1000"