Merge pull request #31 from JuliaArrays/teh/arithdep

Fix ::array + ::Number, for loop, and Val depwarns on 0.7

Author: timholy

REQUIRE

@@ -1,2 +1,2 @@
 julia 0.6
-Compat 0.19.0
+Compat 0.32

src/OffsetArrays.jl

@@ -7,6 +7,14 @@ using Compat
 
 export OffsetArray, @unsafe
 
+# TODO: just use .+
+# See https://github.com/JuliaLang/julia/pull/22932#issuecomment-330711997
+if VERSION < v"0.7.0-DEV.1759"
+    plus(r::AbstractUnitRange, i::Integer) = r + i
+else
+    plus(r::AbstractUnitRange, i::Integer) = broadcast(+, r, i)
+end
+
 struct OffsetArray{T,N,AA<:AbstractArray} <: AbstractArray{T,N}
     parent::AA
     offsets::NTuple{N,Int}
@@ -39,7 +47,7 @@ end
 OffsetArray(A::AbstractArray{T,N}, inds::Vararg{AbstractUnitRange,N}) where {T,N} =
     OffsetArray(A, inds)
 
-Compat.IndexStyle(::Type{OA}) where {OA<:OffsetArray} = IndexStyle(parenttype(OA))
+Base.IndexStyle(::Type{OA}) where {OA<:OffsetArray} = IndexStyle(parenttype(OA))
 parenttype(::Type{OffsetArray{T,N,AA}}) where {T,N,AA} = AA
 parenttype(A::OffsetArray) = parenttype(typeof(A))
 
@@ -55,11 +63,11 @@ Base.eachindex(::IndexLinear, A::OffsetVector)   = indices(A, 1)
 # performance-critical and relies on indices, these are usually worth
 # optimizing thoroughly.
 @inline Base.indices(A::OffsetArray, d) =
-    1 <= d <= length(A.offsets) ? indices(parent(A))[d] + A.offsets[d] : (1:1)
+    1 <= d <= length(A.offsets) ? plus(indices(parent(A))[d], A.offsets[d]) : (1:1)
 @inline Base.indices(A::OffsetArray) =
     _indices(indices(parent(A)), A.offsets)  # would rather use ntuple, but see #15276
 @inline _indices(inds, offsets) =
-    (inds[1]+offsets[1], _indices(tail(inds), tail(offsets))...)
+    (plus(inds[1], offsets[1]), _indices(tail(inds), tail(offsets))...)
 _indices(::Tuple{}, ::Tuple{}) = ()
 Base.indices1(A::OffsetArray{T,0}) where {T} = 1:1  # we only need to specialize this one
 
@@ -136,7 +144,7 @@ _offset(out, ::Tuple{}, ::Tuple{}) = out
 offset(offsets::Tuple{}, inds::Tuple{}) = ()
 offset(offsets::Tuple{Vararg{Int}}, inds::Tuple{}) = error("inds cannot be shorter than offsets")
 
-indexoffset(r::Range) = first(r) - 1
+indexoffset(r::AbstractRange) = first(r) - 1
 indexoffset(i::Integer) = 0
 
 macro unsafe(ex)

test/runtests.jl

@@ -1,19 +1,18 @@
 using Base.Test
 using OffsetArrays
-using Compat
 
 @test isempty(detect_ambiguities(OffsetArrays, Base, Core))
 
 # Basics
 for n = 0:5
     for a in (OffsetArray(ones(Int,ntuple(d->1,n)), ntuple(x->x-1,n)),
-              fill!(OffsetArray(Float64, ntuple(x->(0:0)+x, n)...), 1),
-              fill!(OffsetArray{Float64}(ntuple(x->(0:0)+x, n)), 1),
-              fill!(OffsetArray{Float64}(ntuple(x->(0:0)+x, n)...), 1),
-              fill!(OffsetArray{Float64,n}(ntuple(x->(0:0)+x, n)), 1),
-              fill!(OffsetArray{Float64,n}(ntuple(x->(0:0)+x, n)...), 1))
+              fill!(OffsetArray(Float64, ntuple(x->x:x, n)...), 1),
+              fill!(OffsetArray{Float64}(ntuple(x->x:x, n)), 1),
+              fill!(OffsetArray{Float64}(ntuple(x->x:x, n)...), 1),
+              fill!(OffsetArray{Float64,n}(ntuple(x->x:x, n)), 1),
+              fill!(OffsetArray{Float64,n}(ntuple(x->x:x, n)...), 1))
         @test length(linearindices(a)) == 1
-        @test indices(a) == ntuple(x->x:x,n)
+        @test indices(a) == ntuple(x->x:x, n)
         @test a[1] == 1
     end
 end
@@ -129,8 +128,10 @@ S = view(A, :, :)
 @test indices(S) === (0:1, 3:4)
 
 # iteration
-for (a,d) in zip(A, A0)
-    @test a == d
+let a
+    for (a,d) in zip(A, A0)
+        @test a == d
+    end
 end
 
 # show
@@ -184,8 +185,8 @@ b = reshape(A, -7:-4)
 @test isa(parent(b), Vector{Int})
 @test parent(b) == A0[:]
 a = OffsetArray(rand(3,3,3), -1:1, 0:2, 3:5)
-@test_throws ArgumentError reshape(a, Val{2})
-@test_throws ArgumentError reshape(a, Val{4})
+@test_throws ArgumentError reshape(a, Val(2))
+@test_throws ArgumentError reshape(a, Val(4))
 
 # Indexing with OffsetArray indices
 i1 = OffsetArray([2,1], (-5,))
@@ -328,7 +329,7 @@ v = OffsetArray(rand(8), (-2,))
 @test flipdim(A, 1) == OffsetArray(flipdim(parent(A), 1), A.offsets)
 @test flipdim(A, 2) == OffsetArray(flipdim(parent(A), 2), A.offsets)
 
-@test A+1 == OffsetArray(parent(A)+1, A.offsets)
+@test A.+1 == OffsetArray(parent(A).+1, A.offsets)
 @test 2*A == OffsetArray(2*parent(A), A.offsets)
 @test A+A == OffsetArray(parent(A)+parent(A), A.offsets)
 @test A.*A == OffsetArray(parent(A).*parent(A), A.offsets)