Skip to content
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

Int128 support #132

Merged
merged 6 commits into from
May 22, 2020
Merged

Int128 support #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b5024f
Int128 support
jmkuhn May 20, 2020
1628b70
Update Error messages
jmkuhn May 20, 2020
ce52277
Combine functions
jmkuhn May 20, 2020
a504c7e
Use Integer instead of Int128 where possible
jmkuhn May 20, 2020
66e014a
Correctly handle Unsigned conversions
jmkuhn May 20, 2020
659f557
Correct Abstract Integer handling
jmkuhn May 22, 2020
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
42 changes: 31 additions & 11 deletions src/DecFP.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,36 @@ end # widths w

Base.round(x::DecimalFloatingPoint, ::RoundingMode{:FromZero}) = signbit(x) ? floor(x) : ceil(x)

Base.trunc(::Type{Integer}, x::DecimalFloatingPoint) = trunc(Int, x)
Base.floor(::Type{Integer}, x::DecimalFloatingPoint) = floor(Int, x)
Base.ceil(::Type{Integer}, x::DecimalFloatingPoint) = ceil(Int, x)
Base.round(::Type{Integer}, x::DecimalFloatingPoint) = round(Int, x)
Base.round(::Type{Integer}, x::DecimalFloatingPoint, ::RoundingMode{:NearestTiesAway}) = round(Int, x, RoundNearestTiesAway)
for (f) in (:trunc, :floor, :ceil)
@eval Base.$f(::Type{Signed}, x::DecimalFloatingPoint) = $f(Int, x)
@eval Base.$f(::Type{Unsigned}, x::DecimalFloatingPoint) = $f(UInt, x)
@eval Base.$f(::Type{Integer}, x::DecimalFloatingPoint) = $f(Int, x)

@eval function Base.$f(::Type{I}, x::DecimalFloatingPoint) where {I<:Integer}
x′ = $f(x)
typemin(I) <= x′ <= typemax(I) || throw(InexactError(Symbol($f), I, x))
s, e = sigexp(x′)
return I(flipsign(s * I(10)^e, x))
end
end

Base.convert(::Type{Signed}, x::DecimalFloatingPoint) = convert(Int, x)
Base.convert(::Type{Unsigned}, x::DecimalFloatingPoint) = convert(UInt, x)
Base.convert(::Type{Integer}, x::DecimalFloatingPoint) = convert(Int, x)

function Base.convert(::Type{I}, x::DecimalFloatingPoint) where {I<:Integer}
x != trunc(x) && throw(InexactError(:convert, I, x))
typemin(I) <= x <= typemax(I) || throw(InexactError(:convert, I, x))
s, e = sigexp(x)
return I(flipsign(s * I(10)^e, x))
end

Base.Int128(x::DecimalFloatingPoint) = convert(Int128, x)
Base.UInt128(x::DecimalFloatingPoint) = convert(UInt128, x)

Base.round(::Type{T}, x::DecimalFloatingPoint) where {T<:Integer} = convert(T, round(x))
Base.round(::Type{T}, x::DecimalFloatingPoint, ::RoundingMode{:Nearest}) where {T<:Integer} = convert(T, round(x, RoundNearest))
Base.round(::Type{T}, x::DecimalFloatingPoint, ::RoundingMode{:NearestTiesAway}) where {T<:Integer} = convert(T, round(x, RoundNearestTiesAway))
function Base.round(::Type{T}, x::DecimalFloatingPoint, ::RoundingMode{:NearestTiesUp}) where {T<:Integer}
y = floor(T, x)
ifelse(x==y, y, copysign(floor(T, 2*x-y), x))
Expand Down Expand Up @@ -653,13 +674,12 @@ Base.maxintfloat(::Type{Dec32}) = reinterpret(Dec32, 0x36000001) # Dec32("1e7")
Base.maxintfloat(::Type{Dec64}) = reinterpret(Dec64, 0x33c0000000000001) # Dec64("1e16")
Base.maxintfloat(::Type{Dec128}) = reinterpret(Dec128, 0x30840000000000000000000000000001) # Dec128("1e34")

Base.convert(T::Type{F}, x::Union{Int8,UInt8,Int16,UInt16}) where {F<:DecimalFloatingPoint} = F(Int32(x))
Base.convert(T::Type{F}, x::Integer) where {F<:DecimalFloatingPoint} = F(Int64(x))
Base.convert(T::Type{F}, x::Unsigned) where {F<:DecimalFloatingPoint} = F(UInt64(x))
Base.convert(T::Type{F}, x::Rational) where {F<:DecimalFloatingPoint} = F(x.num) / F(x.den)
Base.convert(T::Type{F}, x::Float16) where {F<:DecimalFloatingPoint} = F(Float32(x))
Base.convert(::Type{F}, x::Union{Int8,UInt8,Int16,UInt16}) where {F<:DecimalFloatingPoint} = F(Int32(x))
Base.convert(::Type{F}, x::Integer) where {F<:DecimalFloatingPoint} = F(string(x))
Base.convert(::Type{F}, x::Rational) where {F<:DecimalFloatingPoint} = F(x.num) / F(x.den)
Base.convert(::Type{F}, x::Float16) where {F<:DecimalFloatingPoint} = F(Float32(x))
promote_rule(::Type{F}, ::Type{Float16}) where {F<:DecimalFloatingPoint} = F
promote_rule(::Type{F}, ::Type{T}) where {F<:DecimalFloatingPoint,T<:Union{Int8,UInt8,Int16,UInt16,Int32,UInt32,Int64,UInt64}} = F
promote_rule(::Type{F}, ::Type{T}) where {F<:DecimalFloatingPoint,T<:Union{Int8,UInt8,Int16,UInt16,Int32,UInt32,Int64,UInt64,Int128,UInt128}} = F

# so that mathconsts get promoted to Dec32, not Dec64, like Float32
promote_rule(::Type{Irrational{s}}, ::Type{F}) where {s,F<:DecimalFloatingPoint} = F
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ for T in (Dec32, Dec64, Dec128)
@test round(T(2.5), RoundNearestTiesAway) === round(T(3.3), RoundNearestTiesAway) === T(3)
@test round(T(2.5), RoundNearestTiesUp) === round(T(3.3), RoundNearestTiesUp) === T(3)

for Ti in (Integer,Int8,UInt8,Int16,UInt16,Int32,UInt32,Int64,UInt64)
for Ti in (Integer,Int8,UInt8,Int16,UInt16,Int32,UInt32,Int64,UInt64,Int128,UInt128)
if Ti != Integer
@test parse(T, "17") == T(Ti(17)) == Ti(17) == Ti(T(17))
end
Expand Down