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

Jump to bottom

NTuples made me sad (so I nixed them) #11242

Merged
merged 16 commits into from
May 5, 2016
Merged

NTuples made me sad (so I nixed them) #11242

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c4f54d1
Add a length parameter N to Vararg, Vararg{T,N}
timholy May 3, 2015
add7a23
implement Vararg{T,N} type rules
timholy May 3, 2015
59ed8a2
Add docs and NEWS on Vararg{T,N}
timholy May 18, 2015
2d43a66
Don't assume a limited set of types for N in Vararg{T,N}
timholy May 18, 2015
bc3ed5d
Add more Vararg{T,N} tests
timholy May 18, 2015
f57b858
Incorporate type_match_invariance_mask in tuple_match
timholy Jan 3, 2016
df69bfd
Add space in Vararg test expectation
timholy Jan 3, 2016
7694e3b
Provide more useful debugging info from testintersect
timholy Jun 4, 2015
d0bf8f8
Fix segfault with invoke
timholy Jun 4, 2015
f75e9d3
Fix Type{Tuple{}} <: Type{NTuple{TypeVar(:N,true)}}
timholy Jun 4, 2015
59160f2
Validate Vararg parameters
timholy Jan 3, 2016
7ee35b0
Re-fix #12092
timholy Jan 3, 2016
82ef48c
Rename enum types
timholy Jan 10, 2016
1f4ae21
Delete unused inst_tupletype_unchecked_uncached
timholy Jan 10, 2016
c66aeb3
Fix Vararg method printing
timholy Apr 10, 2016
92ac59a
normalize more Tuple{Vararg{T,N}} to Tuple{T,...}
vtjnash Apr 29, 2016
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
Prev Previous commit
Next Next commit
Add more Vararg{T,N} tests
  • Loading branch information
@timholy
timholy committed May 5, 2016
commit bc3ed5db1c7334c989418e755b36b91cb3463cca
21 changes: 21 additions & 0 deletions test/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ let T = TypeVar(:T,true)

testintersect(Type{Tuple{Bool,Vararg{Int}}}, Type{Tuple{Vararg{T}}}, Bottom)
testintersect(Type{Tuple{Bool,Vararg{Int}}}, Type{Tuple{T,Vararg{T}}}, Bottom)
testintersect(Tuple{Vararg{T}}, Tuple{Float64,Int}, Bottom)

testintersect(Tuple{Rational{T},T}, Tuple{Rational{Integer},Int}, Tuple{Rational{Integer},Int})

Expand Down Expand Up @@ -122,6 +123,26 @@ let T = TypeVar(:T,Union{Float32,Float64},true)
testintersect(AbstractArray, Matrix{T}, Matrix{T})
end

# Vararg{T,N}
let N = TypeVar(:N,true)
@test is(Bottom,typeintersect(Tuple{Array{Int,N},Vararg{Int,N}}, Tuple{Vector{Int},Real,Real,Real}))
@test is(Bottom,typeintersect(Tuple{Vector{Int},Real,Real,Real}, Tuple{Array{Int,N},Vararg{Int,N}}))
@test Tuple{Int,Vararg{Int,2}} == Tuple{Int,Int,Int}
@test Tuple{Int,Vararg{Int,2}} == Tuple{Int,Int,Vararg{Int,1}}
@test Tuple{Int,Vararg{Int,2}} == Tuple{Int,Int,Int,Vararg{Int,0}}
@test !(Tuple{Int,Vararg{Int,2}} <: Tuple{Int,Int,Int,Vararg{Int,1}})
#@test !(Tuple{Int,Vararg{Int,2}} <: Tuple{Int,Vararg{Int,N}})
@test Tuple{Int,Vararg{Int,N}} == Tuple{Int,Vararg{Int,N}}
#@test !(Tuple{Int,Vararg{Int,2}} <: Tuple{Int,Int,Vararg{Int}})
@test typeintersect(Tuple{Array{Int,N},Vararg{Int,N}},Tuple{Array{Int,0}}) == Tuple{Array{Int,0}}
@test typeintersect(Tuple{Array{Int,N},Vararg{Int,N}},Tuple{Array{Int,2}}) == Bottom

@test typeintersect(Tuple{Int,Vararg{Int,N}}, Tuple{Int,Int,Int,Vararg{Float64}}) == Tuple{Int,Int,Int}
@test typeintersect(Tuple{Int,Vararg{Int,N}}, Tuple{Int,Vararg{Float64}}) == Tuple{Int}
@test typeintersect(Tuple{Array{Int,N},Vararg{Int,N}}, Tuple{Matrix{Int},Int,Int,Vararg{Float64}}) == Tuple{Matrix{Int},Int,Int}
@test typeintersect(Tuple{Array{Int,N},Vararg{Int,N}}, Tuple{Matrix{Int},Int,Vararg{Float64}}) == Bottom
end

@test isa(Int,Type{TypeVar(:T,Number)})
@test !isa(DataType,Type{TypeVar(:T,Number)})
@test DataType <: Type{TypeVar(:T,Type)}
Expand Down