Fixes for Julia v1.6 (#51)

* hash tests: only enforce one-way implication

The integer hash used in Julia v1.6 breaks our previous incorrect
assumption that hash equality ==> equality, so tests must be revised.

* use Big fallback for printf under Julia v1.6-beta

the switch from Grisu to Ryu also changed the Printf ABI.
Until we have time to stuff the libquadmath formatter into
the new logic, this will keep things running (slowly).

* update versions for CI

* Rearrange version branches

Co-authored-by: Simon Byrne <simonbyrne@gmail.com>

Author: RalphAS

.github/workflows/CI.yml

@@ -14,8 +14,9 @@ jobs:
       matrix:
         version:
           - '1.0'
-          - '1.2'
-#          - 'nightly'
+          - '1.5'
+          - '1.6'
+          - 'nightly'
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,6 +1,6 @@
 name = "Quadmath"
 uuid = "be4d8f0f-7fa4-5f49-b795-2f01399ab2dd"
-version = "0.5.4"
+version = "0.5.5-DEV"
 
 [deps]
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

README.md

@@ -1,7 +1,6 @@
 # Quadmath.jl
 
-[![Travis Build Status](https://travis-ci.org/JuliaMath/Quadmath.jl.svg?branch=master)](https://travis-ci.org/JuliaMath/Quadmath.jl)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/wx46vbwmu2ey5qkj/branch/master?svg=true)](https://ci.appveyor.com/project/simonbyrne/quadmath-jl/branch/master)
+[![GitHub CI Build Status](https://github.com/JuliaMath/Quadmath.jl/workflows/CI/badge.svg)](https://github.com/JuliaMath/Quadmath.jl/actions)
 
 This is a Julia interface to libquadmath, providing a `Float128` type corresponding to the IEEE754 binary128 floating point format.
 

src/printf.jl

@@ -1,51 +1,60 @@
-import Printf: ini_dec, fix_dec, ini_hex, ini_HEX
 
-if VERSION < v"1.1"
-using Base.Grisu: DIGITSs
-fix_dec(out, d::Float128, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
-ini_dec(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
-ini_hex(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
-ini_HEX(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
-ini_hex(out, d::Float128, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
-ini_HEX(out, d::Float128, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
-else
-fix_dec(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
-ini_dec(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
-ini_hex(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
-ini_HEX(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
-ini_hex(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
-ini_HEX(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
-end
 
-function fp128_printf(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits)
-    fmt_len = sizeof(flags)+4
-    if width > 0
-        fmt_len += ndigits(width)
-    end
-    if precision >= 0
-        fmt_len += ndigits(precision)+1
-    end
-    fmt = IOBuffer(maxsize=fmt_len)
-    print(fmt, '%')
-    print(fmt, flags)
-    if width > 0
-        print(fmt, width)
+if VERSION < v"1.6.0-beta"
+    import Printf: ini_dec, fix_dec, ini_hex, ini_HEX
+
+    function fp128_printf(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits)
+        fmt_len = sizeof(flags)+4
+        if width > 0
+            fmt_len += ndigits(width)
+        end
+        if precision >= 0
+            fmt_len += ndigits(precision)+1
+        end
+        fmt = IOBuffer(maxsize=fmt_len)
+        print(fmt, '%')
+        print(fmt, flags)
+        if width > 0
+            print(fmt, width)
+        end
+        if precision == 0
+            print(fmt, '.')
+            print(fmt, '0')
+        elseif precision > 0
+            print(fmt, '.')
+            print(fmt, precision)
+        end
+        print(fmt, 'Q')
+        print(fmt, c)
+        write(fmt, UInt8(0))
+        printf_fmt = take!(fmt)
+        @assert length(printf_fmt) == fmt_len
+        bufsiz = length(digits)
+        lng = @ccall(libquadmath.quadmath_snprintf(digits::Ptr{UInt8}, bufsiz::Csize_t, printf_fmt::Ptr{UInt8}, d::(Cfloat128...))::Cint)
+        lng > 0 || error("invalid printf formatting for Float128")
+        unsafe_write(out, pointer(digits), min(lng, bufsiz-1))
+        return (false, ())
     end
-    if precision == 0
-        print(fmt, '.')
-        print(fmt, '0')
-    elseif precision > 0
-        print(fmt, '.')
-        print(fmt, precision)
+
+    if VERSION < v"1.1"
+        using Base.Grisu: DIGITSs
+        fix_dec(out, d::Float128, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
+        ini_dec(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
+        ini_hex(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
+        ini_HEX(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
+        ini_hex(out, d::Float128, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
+        ini_HEX(out, d::Float128, flags::String, width::Int, precision::Int, c::Char) = fp128_printf(out, d, flags, width, precision, c, DIGITSs[Threads.threadid()])
+    else
+        fix_dec(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
+        ini_dec(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
+        ini_hex(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
+        ini_HEX(out, d::Float128, ndigits::Int, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
+        ini_hex(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
+        ini_HEX(out, d::Float128, flags::String, width::Int, precision::Int, c::Char, digits) = fp128_printf(out, d, flags, width, precision, c, digits)
     end
-    print(fmt, 'Q')
-    print(fmt, c)
-    write(fmt, UInt8(0))
-    printf_fmt = take!(fmt)
-    @assert length(printf_fmt) == fmt_len
-    bufsiz = length(digits)
-    lng = @ccall(libquadmath.quadmath_snprintf(digits::Ptr{UInt8}, bufsiz::Csize_t, printf_fmt::Ptr{UInt8}, d::(Cfloat128...))::Cint)
-    lng > 0 || error("invalid printf formatting for Float128")
-    unsafe_write(out, pointer(digits), min(lng, bufsiz-1))
-    return (false, ())
+else
+    # Julia v1.6+
+    # placeholder
+    import Printf
+    Printf.tofloat(x::Float128) = BigFloat(x)
 end

test/hashing.jl

@@ -43,8 +43,7 @@ end
     a = coerce(T, x),
     b = coerce(S, x)
     T == Float128 || S == Float128 || continue # other types are not our problem
-    #println("$(typeof(a)) $a")
-    #println("$(typeof(b)) $b")
-    @test isequal(a,b) == (hash(a)==hash(b))
+    # equality must imply same hash; converse is not guaranteed
+    @test !(isequal(a,b) && (hash(a) != hash(b)))
   end
 end