More comprehensive tests, squashed some bugs

Author: Andy Ferris

src/getindices.jl

@@ -34,6 +34,10 @@ function getindices(container, indices)
     return map(i -> container[i], indices)
 end
 getindices(container, ::Colon) = getindices(container, keys(container))
+getindices(t::Tuple, ::Colon) = t
+@static if VERSION > v"0.7-"
+    getindices(nt::NamedTuple, ::Colon) = nt
+end
 
 function getindices(container, indices::AbstractDict)
     out = empty(indices, keytype(indices), _valtype(container))
@@ -42,12 +46,17 @@ function getindices(container, indices::AbstractDict)
     end
     return out
 end
+function getindices(d::AbstractDict, ::Colon)
+    return copy(d)
+end
 
 # Make a 0-D array instead of scalar
 Base.@propagate_inbounds function getindices(a::AbstractArray, is::Int...)
     out = similar(a, eltype(a), ())
     out[] = a[is...]
     return out
 end
+
+# Ambiguities
 Base.@propagate_inbounds getindices(a::AbstractArray, is::Union{Int,Colon,AbstractArray}...) = a[is...]
-getindices(a::AbstractVector, ::Colon) = a[:] # Ambiguity
+getindices(a::AbstractVector, ::Colon) = a[:]

src/setindices.jl

@@ -18,3 +18,7 @@ function setindices!(container, value, indices::AbstractDict)
     end
     return container
 end
+
+if VERSION < v"0.7-"
+    setindices!(a::AbstractArray, value, ::Colon) = setindices!(a, value, eachindex(a))
+end

src/view.jl

@@ -177,4 +177,4 @@ ViewDict{Symbol,Int64,Array{Int64,1},Dict{Symbol,Int64}} with 2 entries:
 """
 view(d, inds::AbstractDict) = ViewDict(d, inds)
 view(d::AbstractArray, inds::AbstractDict) = ViewDict(d, inds) # disambiguation
-parent(d::ViewDict) = v.parent
+parent(d::ViewDict) = d.parent

test/runtests.jl

@@ -13,6 +13,7 @@ end
     @static if VERSION > v"0.7-"
         @test getindices(d, (aa = :a, cc = :c)) == (aa = "Alice", cc = "Charlie")
     end
+    @test getindices(d, :) == d
 
     v = [11, 12, 13]
     @test (getindices(v, 2)::Array{Int, 0})[] == 12
@@ -22,6 +23,7 @@ end
     @static if VERSION > v"0.7-"
         @test getindices(v, (a = 1, c = 3)) === (a = 11, c = 13)
     end
+    @test getindices(v, :) == v
 
     t = (11, 12, 13)
     @test getindices(t, [1, 3]) == [11, 13]
@@ -30,13 +32,15 @@ end
     @static if VERSION > v"0.7-"
         @test getindices(t, (a = 1, c = 3)) === (a = 11, c = 13)
     end
+    @test getindices(t, :) == t
 
     @static if VERSION > v"0.7-"
         nt = (a = 1, b = 2.0, c = "three")
         @test getindices(nt, [:a, :c]) == [1, "three"]
         @test getindices(nt, Dict(:aa => :a, :cc => :c)) == Dict(:aa => 1, :cc => "three")
         @test getindices(nt, (:a, :c)) == (1, "three")
         @test getindices(nt, (aa = :a, cc = :c)) == (aa = 1, cc = "three")
+        @test getindices(nt, :) == nt
     end
 end
 
@@ -60,6 +64,10 @@ end
         @test d5 == Dict(:a => "Someone", :b => "Bob", :c => "Someone")
     end
 
+    d6 = copy(d)
+    setindices!(d6, "Someone", :)
+    @test d6 == Dict(:a => "Someone", :b => "Someone", :c => "Someone")
+
     v = [11, 12, 13]
     v2 = copy(v)
     setindices!(v2, 20, [1, 3])
@@ -78,27 +86,49 @@ end
         setindices!(v5, 20, (a = 1, c = 3))
         @test v5 == [20, 12, 20]
     end
+
+    v6 = copy(v)
+    setindices!(v6, 20, :)
+    @test v6 == [20, 20, 20]
 end
 
 @testset "view" begin
     d = Dict(:a => "Alice", :b => "Bob", :c => "Charlie")
+    d2 = copy(d)
 
     @test view(d, [:a, :c])::ViewArray == ["Alice", "Charlie"]
     @test view(d, Dict(:aa => :a, :cc => :c))::ViewDict == Dict(:aa => "Alice", :cc => "Charlie")
 
     av = view(d, [:a, :c])
+    @test parent(av) === d
+    @test av[1] == "Alice"
+    @test Indexing.axes(av) === (Base.OneTo(2),)
     av[1] = "Someone"
     @test d == Dict(:a => "Someone", :b => "Bob", :c => "Charlie")
 
-    dv = view(d, Dict(:aa => :a, :cc => :c))
+    dv = view(d2, Dict(:aa => :a, :cc => :c))
+    @test parent(dv) === d2
+    @test dv[:aa] == "Alice"
+    @test keys(dv) ⊆ [:aa, :cc] # Probably will want to change this
+    @test length(keys(dv)) == 2
+    @test haskey(dv, :aa)
     dv[:aa] = "No-one"
-    @test d == Dict(:a => "No-one", :b => "Bob", :c => "Charlie")
+    @test d2 == Dict(:a => "No-one", :b => "Bob", :c => "Charlie")
 
     v = [11, 12, 13]
 
     @test view(v, Dict(:a =>1 , :c => 3))::ViewDict == Dict(:a => 11, :c => 13)
 
     dv2 = view(v, Dict(:a =>1 , :c => 3))
+    @test parent(dv2) === v
+    @test dv2[:a] == 11
+    @test keys(dv2) ⊆ [:a, :c]
+    @test length(keys(dv2)) == 2
+    @test haskey(dv2, :a)
     dv2[:a] = 21
     @test v == [21, 12, 13]
+
+    @test ViewArray(d, [:b, :c])::ViewArray == ["Bob", "Charlie"]
+    @test ViewVector(d, [:b, :c])::ViewVector == ["Bob", "Charlie"]
+    @test ViewMatrix(d, [:b :c; :c :b])::ViewMatrix == ["Bob" "Charlie"; "Charlie" "Bob"]
 end