enable make(NTuple{N,T} where N, [X], n::Integer) where T

Author: rfourquet

src/containers.jl

@@ -27,9 +27,12 @@ macro make_container(margs...)
     definitions = []
     argss = []
     for a in margs
-        push!(argss, a isa Expr && a.head == :vect ? # optional
-                       [nothing, a.args[1]] :
-                       [a])
+        push!(argss,
+              a isa Expr && a.head == :vect ? # optional
+                [nothing, a.args[1]] :
+              a isa Expr && a.head == :call && a.args[1] == :(=>) ? # curly
+                [a.args[2] => a.args[3]] :
+              [a])
 
     end
     pushfirst!(argss, [(), :X, :(::Type{X}) => :X]) # for Sampler
@@ -65,6 +68,7 @@ end
 # Tuple as a container
 @make_container(T::Type{<:Tuple})
 @make_container(::Type{Tuple}, n::Integer)
+@make_container(T::Type{NTuple{N,TT} where N} => TT, n::Integer)
 
 ## arrays (same as in Random, but with explicit type specification, e.g. rand(Int, Array, 4)
 

src/sampling.jl

@@ -197,6 +197,11 @@ make(::Type{Tuple}, ::Type{X}, n::Integer) where {X} = make(NTuple{Int(n)}, X)
 
 make(::Type{Tuple}, n::Integer) = make(Tuple, default_sampling(Tuple), Int(n))
 
+# NTuple{N,T} where N
+make(::Type{NTuple{N,T} where N},            n::Integer) where {T}   = make(NTuple{Int(n),T})
+make(::Type{NTuple{N,T} where N}, X,         n::Integer) where {T}   = make(NTuple{Int(n),T}, X)
+make(::Type{NTuple{N,T} where N}, ::Type{X}, n::Integer) where {T,X} = make(NTuple{Int(n),T}, X)
+
 # disambiguate
 
 make(::Type{T}, X)         where {T<:Tuple}   = _make(T, X)

test/runtests.jl

@@ -191,6 +191,12 @@ const spString = Sampler(MersenneTwister, String)
 
     s = rand(rng..., NTuple{3})
     @test s isa NTuple{3,Float64}
+
+    s = rand(rng..., NTuple{N,UInt8} where N, 3)
+    @test s isa NTuple{3,UInt8}
+    s = rand(rng..., 1:3, NTuple{N,UInt8} where N, 3)
+    @test s isa NTuple{3,UInt8}
+    @test all(in(1:3), s)
 end
 
 @testset "Rand" for rng in ([], [MersenneTwister(0)], [RandomDevice()])
@@ -309,6 +315,14 @@ end
 
     r = rand(make(NTuple{3}))
     @test r isa NTuple{3,Float64}
+
+    r = rand(make(NTuple{N,UInt8} where N, 3))
+    @test r isa NTuple{3,UInt8}
+    r = rand(make(NTuple{N,UInt8} where N, 1:3, 3))
+    @test r isa NTuple{3,UInt8}
+    @test all(in(1:3), r)
+    r = rand(make(NTuple{N,UInt8} where N, UInt8, 3))
+    @test r isa NTuple{3,UInt8}
 end
 
 @testset "rand(make(String, ...))" begin