Merge pull request #33152 from JuliaLang/jq/floattypeshow

Restore float type show information

base/docs/basedocs.jl

@@ -1082,10 +1082,10 @@ Create a `Float32` from `x`. If `x` is not exactly representable then `mode` det
 # Examples
 ```jldoctest
 julia> Float32(1/3, RoundDown)
-0.3333333
+0.3333333f0
 
 julia> Float32(1/3, RoundUp)
-0.33333334
+0.33333334f0
 ```
 
 See [`RoundingMode`](@ref) for available rounding modes.

base/essentials.jl

@@ -141,7 +141,7 @@ julia> x = 1/3
 0.3333333333333333
 
 julia> convert(Float32, x)
-0.33333334
+0.33333334f0
 
 julia> convert(Rational{Int32}, x)
 1//3
@@ -403,11 +403,11 @@ For example,
 # Examples
 ```jldoctest
 julia> reinterpret(Float32, UInt32(7))
-1.0e-44
+1.0f-44
 
 julia> reinterpret(Float32, UInt32[1 2 3 4 5])
 1×5 reinterpret(Float32, ::Array{UInt32,2}):
- 1.0e-45  3.0e-45  4.0e-45  6.0e-45  7.0e-45
+ 1.0f-45  3.0f-45  4.0f-45  6.0f-45  7.0f-45
 ```
 """
 reinterpret(::Type{T}, x) where {T} = bitcast(T, x)

base/float.jl

@@ -764,10 +764,10 @@ The highest finite value representable by the given floating-point DataType `T`.
 # Examples
 ```jldoctest
 julia> floatmax(Float16)
-65500.0
+Float16(65500.0)
 
 julia> floatmax(Float32)
-3.4028235e38
+3.4028235f38
 ```
 """
 floatmax(x::T) where {T<:AbstractFloat} = floatmax(T)
@@ -790,7 +790,7 @@ julia> eps()
 2.220446049250313e-16
 
 julia> eps(Float32)
-1.1920929e-7
+1.1920929f-7
 
 julia> 1.0 + eps()
 1.0000000000000002

base/int.jl

@@ -638,10 +638,10 @@ The lowest value representable by the given (real) numeric DataType `T`.
 # Examples
 ```jldoctest
 julia> typemin(Float16)
--Inf
+-Inf16
 
 julia> typemin(Float32)
--Inf
+-Inf32
 ```
 """
 function typemin end

base/promotion.jl

@@ -246,7 +246,7 @@ If no arguments can be converted, an error is raised.
 # Examples
 ```jldoctest
 julia> promote(Int8(1), Float16(4.5), Float32(4.1))
-(1.0, 4.5, 4.1)
+(1.0f0, 4.5f0, 4.1f0)
 ```
 """
 function promote end

base/ryu/Ryu.jl

@@ -6,8 +6,8 @@ include("fixed.jl")
 include("exp.jl")
 
 neededdigits(::Type{Float64}) = 309 + 17
-neededdigits(::Type{Float32}) = 39 + 9
-neededdigits(::Type{Float16}) = 9 + 5
+neededdigits(::Type{Float32}) = 39 + 9 + 2
+neededdigits(::Type{Float16}) = 9 + 5 + 9
 
 """
     Ryu.writeshortest(x, plus=false, space=false, hash=true, precision=-1, expchar=UInt8('e'), padexp=false, decchar=UInt8('.'))
@@ -36,7 +36,6 @@ function writeshortest(x::T,
         decchar::UInt8=UInt8('.')) where {T <: Base.IEEEFloat}
     buf = Base.StringVector(neededdigits(T))
     pos = writeshortest(buf, 1, x)
-    @assert pos - 1 <= length(buf)
     return String(resize!(buf, pos - 1))
 end
 
@@ -58,7 +57,6 @@ Various options for the output format include:
 function writefixed(x::T, precision) where {T <: Base.IEEEFloat}
     buf = Base.StringVector(precision + neededdigits(T))
     pos = writefixed(buf, 1, x, false, false, false, precision)
-    @assert pos - 1 <= length(buf)
     return String(resize!(buf, pos - 1))
 end
 
@@ -81,7 +79,6 @@ Various options for the output format include:
 function writeexp(x::T, precision) where {T <: Base.IEEEFloat}
     buf = Base.StringVector(precision + neededdigits(T))
     pos = writeexp(buf, 1, x, false, false, false, precision)
-    @assert pos - 1 <= length(buf)
     return String(resize!(buf, pos - 1))
 end
 
@@ -90,10 +87,20 @@ function Base.show(io::IO, x::T) where {T <: Base.IEEEFloat}
         x = round(x, sigdigits=6)
     end
     buf = Base.StringVector(neededdigits(T))
-    pos = writeshortest(buf, 1, x)
-    @assert pos - 1 <= length(buf)
+    typed = !get(io, :compact, false) && 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)
     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)
+    return String(resize!(buf, pos - 1))
+end
+
+Base.print(io::IO, x::Union{Float16, Float32}) = show(IOContext(io, :compact => true), x)
+
 end # module

base/ryu/shortest.jl

@@ -1,6 +1,6 @@
 @inline function writeshortest(buf::Vector{UInt8}, pos, x::T,
     plus=false, space=false, hash=true,
-    precision=-1, expchar=UInt8('e'), padexp=false, decchar=UInt8('.')) where {T}
+    precision=-1, expchar=UInt8('e'), padexp=false, decchar=UInt8('.'), typed=false) where {T}
     @assert 0 < pos <= length(buf)
     neg = signbit(x)
     # special cases
@@ -23,27 +23,56 @@
         end
         if precision == -1
             buf[pos] = UInt8('0')
-            return pos + 1
+            pos += 1
+            if typed && x isa Float32
+                buf[pos] = UInt8('f')
+                buf[pos + 1] = UInt8('0')
+                pos += 2
+            end
+            return pos
         end
         while precision > 1
             buf[pos] = UInt8('0')
             pos += 1
             precision -= 1
         end
+        if typed && x isa Float32
+            buf[pos] = UInt8('f')
+            buf[pos + 1] = UInt8('0')
+            pos += 2
+        end
         return pos
     elseif isnan(x)
         buf[pos] = UInt8('N')
         buf[pos + 1] = UInt8('a')
         buf[pos + 2] = UInt8('N')
-        return pos + 3
+        if typed
+            if x isa Float32
+                buf[pos + 3] = UInt8('3')
+                buf[pos + 4] = UInt8('2')
+            elseif x isa Float16
+                buf[pos + 3] = UInt8('1')
+                buf[pos + 4] = UInt8('6')
+            end
+        end
+        return pos + 3 + (typed && x isa Union{Float32, Float16} ? 2 : 0)
     elseif !isfinite(x)
         if neg
             buf[pos] = UInt8('-')
         end
         buf[pos + neg] = UInt8('I')
         buf[pos + neg + 1] = UInt8('n')
         buf[pos + neg + 2] = UInt8('f')
-        return pos + neg + 3
+        if typed
+            if x isa Float32
+                buf[pos + neg + 3] = UInt8('3')
+                buf[pos + neg + 4] = UInt8('2')
+            elseif x isa Float16
+                buf[pos + neg + 3] = UInt8('1')
+                buf[pos + neg + 4] = UInt8('6')
+            end
+        end
+        return pos + neg + 3 + (typed && x isa Union{Float32, Float16} ? 2 : 0)
     end
 
     bits = uint(x)
@@ -191,6 +220,17 @@
         end
     end
 
+    if typed && x isa Float16
+        buf[pos] = UInt8('F')
+        buf[pos + 1] = UInt8('l')
+        buf[pos + 2] = UInt8('o')
+        buf[pos + 3] = UInt8('a')
+        buf[pos + 4] = UInt8('t')
+        buf[pos + 5] = UInt8('1')
+        buf[pos + 6] = UInt8('6')
+        buf[pos + 7] = UInt8('(')
+        pos += 8
+    end
     if neg
         buf[pos] = UInt8('-')
         pos += 1
@@ -205,7 +245,7 @@
     olength = decimallength(output)
     exp_form = true
     pt = nexp + olength
-    if -4 < pt <= (precision == -1 ? (T == Float16 ? 5 : 6) : precision) #&& !(pt >= olength && abs(mod(x + 0.05, 10^(pt - olength)) - 0.05) > 0.05)
+    if -4 < pt <= (precision == -1 ? (T == Float16 ? 5 : 6) : precision)
         exp_form = false
         if pt <= 0
             buf[pos] = UInt8('0')
@@ -311,6 +351,11 @@
                 precision -= 1
             end
         end
+        if typed && x isa Float32
+            buf[pos] = UInt8('f')
+            buf[pos + 1] = UInt8('0')
+            pos += 2
+        end
     else
         if olength > 1 || hash
             buf[pos] = decchar
@@ -356,6 +401,10 @@
             pos += 1
         end
     end
+    if typed && x isa Float16
+        buf[pos] = UInt8(')')
+        pos += 1
+    end
 
     return pos
 end

doc/src/manual/integers-and-floating-point-numbers.md

@@ -280,20 +280,20 @@ entered by writing an `f` in place of `e`:
 
 ```jldoctest
 julia> 0.5f0
-0.5
+0.5f0
 
 julia> typeof(ans)
 Float32
 
 julia> 2.5f-4
-0.00025
+0.00025f0
 ```
 
 Values can be converted to [`Float32`](@ref) easily:
 
 ```jldoctest
 julia> Float32(-1.5)
--1.5
+-1.5f0
 
 julia> typeof(ans)
 Float32
@@ -324,7 +324,7 @@ julia> sizeof(Float16(4.))
 2
 
 julia> 2*Float16(4.)
-8.0
+Float16(8.0)
 ```
 
 The underscore `_` can be used as digit separator:
@@ -408,10 +408,10 @@ The [`typemin`](@ref) and [`typemax`](@ref) functions also apply to floating-poi
 
 ```jldoctest
 julia> (typemin(Float16),typemax(Float16))
-(-Inf, Inf)
+(-Inf16, Inf16)
 
 julia> (typemin(Float32),typemax(Float32))
-(-Inf, Inf)
+(-Inf32, Inf32)
 
 julia> (typemin(Float64),typemax(Float64))
 (-Inf, Inf)
@@ -428,7 +428,7 @@ floating-point value:
 
 ```jldoctest
 julia> eps(Float32)
-1.1920929e-7
+1.1920929f-7
 
 julia> eps(Float64)
 2.220446049250313e-16
@@ -468,13 +468,13 @@ the next largest or smallest representable floating-point number to the argument
 
 ```jldoctest
 julia> x = 1.25f0
-1.25
+1.25f0
 
 julia> nextfloat(x)
-1.2500001
+1.2500001f0
 
 julia> prevfloat(x)
-1.2499999
+1.2499999f0
 
 julia> bitstring(prevfloat(x))
 "00111111100111111111111111111111"
@@ -706,7 +706,7 @@ Examples:
 
 ```jldoctest
 julia> zero(Float32)
-0.0
+0.0f0
 
 julia> zero(1.0)
 0.0

doc/src/manual/performance-tips.md

@@ -275,7 +275,7 @@ julia> typeof(t.a)
 Float64
 
 julia> t.a = 4.5f0
-4.5
+4.5f0
 
 julia> typeof(t.a)
 Float32
@@ -285,7 +285,7 @@ In contrast, once `m` is constructed, the type of `m.a` cannot change:
 
 ```jldoctest myambig2
 julia> m.a = 4.5f0
-4.5
+4.5f0
 
 julia> typeof(m.a)
 Float64
@@ -306,7 +306,7 @@ julia> typeof(m.a)
 Float64
 
 julia> m.a = 4.5f0
-4.5
+4.5f0
 
 julia> typeof(m.a)
 Float32
@@ -1339,10 +1339,10 @@ such as `x-y == 0` implies `x == y`:
 julia> x = 3f-38; y = 2f-38;
 
 julia> set_zero_subnormals(true); (x - y, x == y)
-(0.0, false)
+(0.0f0, false)
 
 julia> set_zero_subnormals(false); (x - y, x == y)
-(1.0000001e-38, false)
+(1.0000001f-38, false)
 ```
 
 In some applications, an alternative to zeroing subnormal numbers is to inject a tiny bit of noise.

doc/src/manual/types.md

@@ -929,7 +929,7 @@ or a type that specifies only field names:
 
 ```jldoctest
 julia> NamedTuple{(:a, :b),Tuple{Float32, String}}((1,""))
-(a = 1.0, b = "")
+(a = 1.0f0, b = "")
 
 julia> NamedTuple{(:a, :b)}((1,""))
 (a = 1, b = "")

stdlib/LinearAlgebra/test/uniformscaling.jl

@@ -81,7 +81,7 @@ end
 @test sprint(show,MIME"text/plain"(),UniformScaling(one(ComplexF64))) == "LinearAlgebra.UniformScaling{Complex{Float64}}\n(1.0 + 0.0im)*I"
 @test sprint(show,MIME"text/plain"(),UniformScaling(one(Float32))) == "LinearAlgebra.UniformScaling{Float32}\n1.0*I"
 @test sprint(show,UniformScaling(one(ComplexF64))) == "LinearAlgebra.UniformScaling{Complex{Float64}}(1.0 + 0.0im)"
-@test sprint(show,UniformScaling(one(Float32))) == "LinearAlgebra.UniformScaling{Float32}(1.0)"
+@test sprint(show,UniformScaling(one(Float32))) == "LinearAlgebra.UniformScaling{Float32}(1.0f0)"
 
 let
     λ = complex(randn(),randn())