Merge pull request JuliaLang#37512 from JuliaLang/jq/37507

Fix coercion of floats to integer for %d printf specifier
tekverkp · Sep 10, 2020 · 0d7dc96 · 0d7dc96
2 parents 10f5a05 + 73c4890
commit 0d7dc96
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1,982 deletions.
diff --git a/base/grisu/grisu.jl b/base/grisu/grisu.jl
diff --git a/stdlib/Printf/src/Printf.jl b/stdlib/Printf/src/Printf.jl
@@ -266,7 +266,7 @@ end
  leftalign, plus, space, zero, hash, width, prec =
  spec.leftalign, spec.plus, spec.space, spec.zero, spec.hash, spec.width, spec.precision
  bs = base(T)
- arg2 = arg isa AbstractFloat ? Integer(trunc(arg)) : arg
+ arg2 = arg isa AbstractFloat ? Integer(round(arg)) : arg
  n = i = ndigits(arg2, base=bs, pad=1)
  x, neg = arg2 < 0 ? (-arg2, true) : (arg2, false)
  arglen = n + (neg || (plus | space)) +
@@ -675,7 +675,7 @@ function plength(f::Spec{T}, x) where {T <: Strings}
 end
 
 function plength(f::Spec{T}, x) where {T <: Ints}
- x2 = x isa AbstractFloat ? Integer(trunc(x)) : x
+ x2 = x isa AbstractFloat ? Integer(round(x)) : x
  return max(f.width, f.precision + ndigits(x2, base=base(T), pad=1) + 5)
 end
 

diff --git a/stdlib/Printf/test/runtests.jl b/stdlib/Printf/test/runtests.jl
@@ -423,6 +423,8 @@ end
  @test_throws ArgumentError @sprintf("%s%%%s", "a")
  @test @sprintf("%s%%%s", "a", "b") == "a%%b"
 
+ # print float as %d uses round(x)
+ @test @sprintf("%d", 25.5) == "26"
 end
 
 @testset "integers" begin