Merge pull request #41 from JuliaString/spj/merge

Merge in recent PRs from JuliaIO/Formatting.jl

Author: ScottPJones

.gitignore

@@ -0,0 +1,3 @@
+*.jl.cov
+*.jl.*.cov
+*.jl.mem

.travis.yml

@@ -21,7 +21,6 @@ matrix:
 
 # uncomment the following lines to override the default test script
 #script:
-#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#  - julia -e 'if VERSION < v"0.7.0-DEV.5183" ; Pkg.add("Compat") ; Pkg.clone(pwd()) ; else ; Pkg.up() ; end ; Pkg.test("Format"; coverage=true)'
+
 after_success:
   - julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("Format")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Codecov.process_folder())'

Project.toml

@@ -1,9 +1,31 @@
-authors = ["ScottPJones <[email protected]>"]
+authors = [
+    "Dahua Lin <[email protected]>",
+    "John M Kuhn <[email protected]>",
+    "ScottPJones <[email protected]>",
+    "Thomas Breloff <[email protected]>",
+    "Alex Arslan <[email protected]>",
+    "Chuan-Zheng Lee <[email protected]>",
+    "Galen Lynch <[email protected]>",
+    "Iain Dunning <[email protected]>",
+    "Joseph Kleinhenz <[email protected]>",
+    "Keno Fischer <[email protected]>",
+    "Kevin Squire <[email protected]>",
+    "Theodore Papamarkou <[email protected]>",
+    "Tony Fong <[email protected]>",
+    "Tony Kelman <[email protected]>",
+    "Viral B. Shah <[email protected]>",
+    "Yichao Yu <[email protected]>",
+    "odow <[email protected]>",
+    "ranjanan <[email protected]>"
+    ]
 desc = "C, Python, and type-defined numeric and string formatting"
 keywords = ["Strings", "Formatting"]
 license = "MIT"
 name = "Format"
 uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
+version = "0.7.2"
 
 [deps]
-Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
+Compat  = "34da2185-b29b-5c13-b0c7-acf172513d20"
+Pkg     = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+Test    = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

REQUIRE

@@ -1,2 +1,2 @@
-julia 0.6
+julia 0.6 2-
 Compat 1.0.1

appveyor.yml

@@ -11,9 +11,10 @@ platform:
 
 ## uncomment the following lines to allow failures on nightly julia
 ## (tests will run but not make your overall status red)
-#matrix:
-#  allow_failures:
-#  - julia_version: latest
+matrix:
+  allow_failures:
+  - julia_version: 1.0
+  - julia_version: latest
 
 branches:
   only:

src/cformat.jl

@@ -190,11 +190,11 @@ function format( x::T;
                     (1024.0 ^8,  "Yi" ),
                     (1024.0 ^7,  "Zi" ),
                     (1024.0 ^6,  "Ei" ),
-                    (1024^5,  "Pi" ),
-                    (1024^4,  "Ti" ),
-                    (1024^3,  "Gi"),
-                    (1024^2,  "Mi"),
-                    (1024,    "Ki")
+                    (1024.0 ^5,  "Pi" ),
+                    (1024.0 ^4,  "Ti" ),
+                    (1024.0 ^3,  "Gi"),
+                    (1024.0 ^2,  "Mi"),
+                    (1024.0,     "Ki")
                 ]
             else # :finance
                 scales = [

src/fmtcore.jl

@@ -159,8 +159,7 @@ end
 
 function _pfmt_f(out::IO, fs::FormatSpec, x::AbstractFloat)
     # separate sign, integer, and decimal part
-    rax = (@static VERSION < v"0.7.0-DEV.4804" ? round(abs(x), fs.prec) :
-           round(abs(x); digits=fs.prec))
+    rax = Compat.round(abs(x), digits = fs.prec)
     sch = _signchar(x, fs.sign)
     intv = trunc(Integer, rax)
     decv = rax - intv
@@ -191,6 +190,10 @@ function _pfmt_floate(out::IO, sch::AbstractChar, zs::Integer, u::Real, prec::In
                       ec::AbstractChar)
     intv = trunc(Integer, u)
     decv = u - intv
+    if intv == 0 && decv != 0
+        intv = 1
+        decv -= 1
+    end
     _pfmt_float(out, sch, zs, intv, decv, prec)
     print(out, ec)
     if e >= 0
@@ -203,36 +206,6 @@ function _pfmt_floate(out::IO, sch::AbstractChar, zs::Integer, u::Real, prec::In
     _pfmt_intdigits(out, e, _Dec())
 end
 
-# Pull in definition of signif from v0.6.2 base, since it is currently broken for
-# BigFloat and DecFP (at least) on master
-
-@static if VERSION >= v"0.7.0-DEV.4804"
-# adapted from Matlab File Exchange roundsd: http://www.mathworks.com/matlabcentral/fileexchange/26212
-# for round, og is the power of 10 relative to the decimal point
-# for signif, og is the absolute power of 10
-# digits and base must be integers, x must be convertable to float
-
-function signif(x::Real, digits::Integer, base::Integer=10)
-    digits < 1 && throw(DomainError())
-
-    x = float(x)
-    (x == 0 || !isfinite(x)) && return x
-    if base == 10
-        e = floor(log10(abs(x)) - digits + 1.)
-        og = oftype(x, exp10(abs(e)))
-    elseif base == 2
-        e = exponent(abs(x)) - digits + 1.
-        og = oftype(x, exp2(abs(e)))
-    else
-        e = floor(log(base, abs(x)) - digits + 1.)
-        og = oftype(x, float(base) ^ abs(e))
-    end
-    # for numeric stability
-    r = e >= 0 ? round(x/og)*og : round(x*og)/og
-    isfinite(r) ? r : x
-end
-end
-
 function _pfmt_e(out::IO, fs::FormatSpec, x::AbstractFloat)
     # extract sign, significand, and exponent
     ax = abs(x)
@@ -241,7 +214,7 @@ function _pfmt_e(out::IO, fs::FormatSpec, x::AbstractFloat)
         e = 0
         u = zero(x)
     else
-        rax = signif(ax, fs.prec + 1) # round(ax; sigdigits = fs.prec + 1)
+        rax = Compat.round(ax, sigdigits = fs.prec + 1)
         e = floor(Integer, log10(rax))  # exponent
         u = rax * exp10(-e)  # significand
     end