Improve StaticInt tests

Author: chriselrod

src/static.jl

@@ -132,6 +132,8 @@ end
 @inline static_last(x) = maybe_static(known_last, last, x)
 @inline static_step(x) = maybe_static(known_step, step, x)
 
+@inline Base.widen(::StaticInt{N}) where {N} = widen(N)
+
 Base.UnitRange{T}(start::StaticInt, stop) where {T<:Real} = UnitRange{T}(T(start), stop)
 Base.UnitRange{T}(start, stop::StaticInt) where {T<:Real} = UnitRange{T}(start, T(stop))
 function Base.UnitRange{T}(start::StaticInt, stop::StaticInt) where {T<:Real}

test/runtests.jl

@@ -553,19 +553,21 @@ end
 @testset "StaticInt" begin
     @test iszero(StaticInt(0))
     @test !iszero(StaticInt(1))
+    @test !isone(StaticInt(0))
+    @test isone(StaticInt(1))
     @test @inferred(one(StaticInt(1))) === StaticInt(1)
     @test @inferred(zero(StaticInt(1))) === StaticInt(0)
     @test @inferred(one(StaticInt)) === StaticInt(1)
-    @test @inferred(zero(StaticInt)) === StaticInt(0)
+    @test @inferred(zero(StaticInt)) === StaticInt(0) === StaticInt(StaticInt(Val(0)))
     @test eltype(one(StaticInt)) <: Int
 
     x = StaticInt(1)
     @test @inferred(Bool(x)) isa Bool
     @test @inferred(BigInt(x)) isa BigInt
     @test @inferred(Integer(x)) === x
     # test for ambiguities and correctness
-    for i ∈ [StaticInt(0), StaticInt(1), StaticInt(2), 3]
-        for j ∈ [StaticInt(0), StaticInt(1), StaticInt(2), 3]
+    for i ∈ Any[StaticInt(0), StaticInt(1), StaticInt(2), 3]
+        for j ∈ Any[StaticInt(0), StaticInt(1), StaticInt(2), 3]
             i === j === 3 && continue
             for f ∈ [+, -, *, ÷, %, <<, >>, >>>, &, |, ⊻, ==, ≤, ≥]
                 (iszero(j) && ((f === ÷) || (f === %))) && continue # integer division error
@@ -574,10 +576,15 @@ end
         end
         i == 3 && break
         for f ∈ [+, -, *, /, ÷, %, ==, ≤, ≥]
-            x = f(convert(Int, i), 1.4)
-            y = f(1.4, convert(Int, i))
-            @test convert(typeof(x), @inferred(f(i, 1.4))) === x
-            @test convert(typeof(y), @inferred(f(1.4, i))) === y # if f is division and i === StaticInt(0), returns `NaN`; hence use of ==== in check.
+            w = f(convert(Int, i), 1.4)
+            x = f(1.4, convert(Int, i))
+            @test convert(typeof(w), @inferred(f(i, 1.4))) === w
+            @test convert(typeof(x), @inferred(f(1.4, i))) === x # if f is division and i === StaticInt(0), returns `NaN`; hence use of ==== in check.
+            (((f === ÷) || (f === %)) && (i === StaticInt(0))) && continue
+            y = f(convert(Int, i), 2 // 7)
+            z = f(2 // 7, convert(Int, i))
+            @test convert(typeof(y), @inferred(f(i, 2 // 7))) === y
+            @test convert(typeof(z), @inferred(f(2 // 7, i))) === z 
         end
     end
 end