Skip to content

tiny PR to fix writeshortest for 0.0 when hash==false #58502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tiny PR to fix writeshortest for 0.0 when hash==false #58502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c48c86
fix writeshortest for 0.0 when hash==false
digital-carver May 22, 2025
1f5c266
tests added for Ryu.writeshortest output format options
digital-carver May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions base/ryu/shortest.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,10 @@ function writeshortest(buf::AbstractVector{UInt8}, pos, x::T,
pos += 1
end
if precision == -1
@inbounds buf[pos] = UInt8('0')
pos += 1
if hash
@inbounds buf[pos] = UInt8('0')
pos += 1
end
if typed && x isa Float32
@inbounds buf[pos] = UInt8('f')
@inbounds buf[pos + 1] = UInt8('0')
Expand Down
50 changes: 50 additions & 0 deletions test/ryu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,34 @@ todouble(sign, exp, mant) = Core.bitcast(Float64, (UInt64(sign) << 63) | (UInt64
@test Ryu.writeshortest(-Inf) == "-Inf"
end

@testset "OutputOptions" begin
# plus
@test "+1" == Base.Ryu.writeshortest(1.0, true, false, false)
@test "-1" == Base.Ryu.writeshortest(-1.0, true, false, false)

# space
@test " 1" == Ryu.writeshortest(1.0, false, true, false)

# hash
@test "0" == Ryu.writeshortest(0.0, false, false, false)

# precision
@test "9.9900" == Ryu.writeshortest(9.99, false, false, true, 5)
@test "1." == Ryu.writeshortest(1.0, false, false, true, 1)

# expchar
@test "1.0d6" == Ryu.writeshortest(1e6, false, false, true, -1, UInt8('d'))

# padexp
@test "3.0e+08" == Ryu.writeshortest(3e8, false, false, true, -1, UInt8('e'), true)

# decchar
@test "3,14" == Ryu.writeshortest(3.14, false, false, true, -1, UInt8('e'), false, UInt8(','))

# compact
@test "0.333333" == Ryu.writeshortest(1/3, false, false, true, -1, UInt8('e'), false, UInt8('.'), false, true)
end

@testset "SwitchToSubnormal" begin
@test "2.2250738585072014e-308" == Ryu.writeshortest(2.2250738585072014e-308)
end
Expand Down Expand Up @@ -241,6 +269,17 @@ end # Float64
@test "-Inf" == Ryu.writeshortest(Float32(-Inf))
end

@testset "OutputOptions" begin
# typed
@test "1.0f0" == Ryu.writeshortest(Float32(1.0), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)
@test "Inf32" == Ryu.writeshortest(Float32(Inf), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)
@test "NaN32" == Ryu.writeshortest(Float32(NaN), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)
@test "3.14f0" == Ryu.writeshortest(Float32(3.14), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)

# typed and no-hash
@test "1f0" == Ryu.writeshortest(1.0f0, false, false, false, -1, UInt8('e'), false, UInt8('.'), true)
end

@testset "SwitchToSubnormal" begin
@test "1.1754944e-38" == Ryu.writeshortest(1.1754944f-38)
end
Expand Down Expand Up @@ -341,6 +380,17 @@ end # Float32
@test "-Inf" == Ryu.writeshortest(Float16(-Inf))
end

@testset "OutputOptions" begin
# typed
@test "Float16(1.0)" == Ryu.writeshortest(Float16(1.0), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)
@test "Inf16" == Ryu.writeshortest(Float16(Inf), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)
@test "NaN16" == Ryu.writeshortest(Float16(NaN), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)
@test "Float16(3.14)" == Ryu.writeshortest(Float16(3.14), false, false, true, -1, UInt8('e'), false, UInt8('.'), true)

# typed and no-hash
@test "Float16(1)" == Ryu.writeshortest(Float16(1.0), false, false, false, -1, UInt8('e'), false, UInt8('.'), true)
end

let x=floatmin(Float16)
while x <= floatmax(Float16)
@test parse(Float16, Ryu.writeshortest(x)) == x
Expand Down
Loading