fix printing of Float32s (#33909)

JuliaLang · Apr 11, 2020 · 2ea0375 · 2ea0375
1 parent 96391cb
commit 2ea0375
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/base/ryu/Ryu.jl b/base/ryu/Ryu.jl
@@ -108,23 +108,23 @@ function writeexp(x::T,
     return String(resize!(buf, pos - 1))
 end
 
-function Base.show(io::IO, x::T, forceuntyped::Bool=false) where {T <: Base.IEEEFloat}
+function Base.show(io::IO, x::T, forceuntyped::Bool=false, fromprint::Bool=false) where {T <: Base.IEEEFloat}
     compact = get(io, :compact, false)
     buf = Base.StringVector(neededdigits(T))
     typed = !forceuntyped && !compact && get(io, :typeinfo, Any) != typeof(x)
     pos = writeshortest(buf, 1, x, false, false, true, -1,
-        x isa Float32 ? UInt8('f') : UInt8('e'), false, UInt8('.'), typed, compact)
+        (x isa Float32 && !fromprint) ? UInt8('f') : UInt8('e'), false, UInt8('.'), typed, compact)
     write(io, resize!(buf, pos - 1))
     return
 end
 
 function Base.string(x::T) where {T <: Base.IEEEFloat}
     buf = Base.StringVector(neededdigits(T))
     pos = writeshortest(buf, 1, x, false, false, true, -1,
-        x isa Float32 ? UInt8('f') : UInt8('e'), false, UInt8('.'), false, false)
+        UInt8('e'), false, UInt8('.'), false, false)
     return String(resize!(buf, pos - 1))
 end
 
-Base.print(io::IO, x::Union{Float16, Float32}) = show(io, x, true)
+Base.print(io::IO, x::Union{Float16, Float32}) = show(io, x, true, true)
 
 end # module
diff --git a/test/show.jl b/test/show.jl
@@ -966,7 +966,8 @@ test_repr("(:).a")
 @test isa(repr("text/plain", String(UInt8[0x00:0xff;])), String)
 
 # don't use julia-specific `f` in Float32 printing (PR #18053)
-@test sprint(print, 1f-7) == "1.0f-7"
+@test sprint(print, 1f-7) == "1.0e-7"
+@test string(1f-7) == "1.0e-7"
 
 let d = TextDisplay(IOBuffer())
     @test_throws MethodError display(d, "text/foobar", [3 1 4])