Add Float16 comparisons (JuliaLang#29916)

* Add Float16 comparisons * Add @eval * Add union * Add != to tests
halleysfifthinc · Dec 13, 2018 · 1d3c371 · 1d3c371
1 parent bbd5414
commit 1d3c371
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/base/float.jl b/base/float.jl
@@ -503,15 +503,18 @@ for Ti in (Int64,UInt64,Int128,UInt128)
  end
  end
 end
+for op in (:(==), :<, :<=)
+ @eval begin
+ ($op)(x::Float16, y::Union{Int128,UInt128,Int64,UInt64}) = ($op)(Float64(x), Float64(y))
+ ($op)(x::Union{Int128,UInt128,Int64,UInt64}, y::Float16) = ($op)(Float64(x), Float64(y))
 
-==(x::Float32, y::Union{Int32,UInt32}) = Float64(x)==Float64(y)
-==(x::Union{Int32,UInt32}, y::Float32) = Float64(x)==Float64(y)
-
-<(x::Float32, y::Union{Int32,UInt32}) = Float64(x)<Float64(y)
-<(x::Union{Int32,UInt32}, y::Float32) = Float64(x)<Float64(y)
+ ($op)(x::Union{Float16,Float32}, y::Union{Int32,UInt32}) = ($op)(Float64(x), Float64(y))
+ ($op)(x::Union{Int32,UInt32}, y::Union{Float16,Float32}) = ($op)(Float64(x), Float64(y))
 
-<=(x::Float32, y::Union{Int32,UInt32}) = Float64(x)<=Float64(y)
-<=(x::Union{Int32,UInt32}, y::Float32) = Float64(x)<=Float64(y)
+ ($op)(x::Float16, y::Union{Int16,UInt16}) = ($op)(Float32(x), Float32(y))
+ ($op)(x::Union{Int16,UInt16}, y::Float16) = ($op)(Float32(x), Float32(y))
+ end
+end
 
 
 abs(x::Float16) = reinterpret(Float16, reinterpret(UInt16, x) & 0x7fff)

diff --git a/test/numbers.jl b/test/numbers.jl
@@ -993,6 +993,16 @@ end
  @test Float64(UInt128(3.7e19)) == 3.7e19
  @test Float64(UInt128(3.7e30)) == 3.7e30
 end
+@testset "Float16 vs Int comparisons" begin
+ @test Inf16 != typemax(Int16)
+ @test Inf16 != typemax(Int32)
+ @test Inf16 != typemax(Int64)
+ @test Inf16 != typemax(Int128)
+ @test Inf16 != typemax(UInt16)
+ @test Inf16 != typemax(UInt32)
+ @test Inf16 != typemax(UInt64)
+ @test Inf16 != typemax(UInt128)
+end
 @testset "NaN comparisons" begin
  @test !(NaN <= 1)
  @test !(NaN >= 1)