Skip to content

Commit 7f21988

Browse files
committed
Fix test for exponentially growing promote_type (#280)
1 parent 265c52f commit 7f21988

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

test/fixed.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,13 @@ end
522522
@test @inferred(promote_type(Float32, Int, Q0f7)) === Float32
523523
@test @inferred(promote_type(Float32, Q0f7, Int)) === Float32
524524

525-
@test @inferred(promote_type(Q0f7,Q1f6,Q2f5,Q3f4,Q4f3,Q5f2)) == Fixed{Int128,7}
525+
if promote_type(Int, Float32, Complex{Int}, typeof(pi)) === ComplexF64
526+
# right-to-left
527+
@test @inferred(promote_type(Q0f7, Q1f6, Q2f5, Q3f4, Q4f3, Q5f2)) == Fixed{Int128,7}
528+
else
529+
# left-to-right
530+
@test @inferred(promote_type(Q5f2, Q4f3, Q3f4, Q2f5, Q1f6, Q0f7)) == Fixed{Int128,7}
531+
end
526532

527533
@test @inferred(promote_type(Q0f7, N0f32)) === FixedPoint # Float64 on v0.9 (#207)
528534
end

test/normed.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,13 @@ end
538538
@test @inferred(promote_type(Float32, Int, N0f8)) === Float32
539539
@test @inferred(promote_type(Float32, N0f8, Int)) === Float32
540540

541-
@test @inferred(promote_type(N0f8,N1f7,N2f6,N3f5,N4f4,N5f3)) === Normed{UInt128,8}
541+
if promote_type(Int, Float32, Complex{Int}, typeof(pi)) === ComplexF64
542+
# right-to-left
543+
@test @inferred(promote_type(N0f8, N1f7, N2f6, N3f5, N4f4, N5f3)) === Normed{UInt128,8}
544+
else
545+
# left-to-right
546+
@test @inferred(promote_type(N5f3, N4f4, N3f5, N2f6, N1f7, N0f8)) === Normed{UInt128,8}
547+
end
542548

543549
@test @inferred(promote_type(N0f8, Q0f31)) === FixedPoint # Float64 on v0.9 (#207)
544550
end

0 commit comments

Comments
 (0)