From a5a63c733566963c25a664d55158edb52dd12393 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sat, 19 Sep 2015 19:40:50 -0400 Subject: [PATCH] Fix 0.4 deprecated bindings --- REQUIRE | 1 + src/ArrayViews.jl | 2 ++ src/common.jl | 6 +++--- src/contrank.jl | 6 +++--- src/convenience.jl | 10 +++++----- src/layout.jl | 6 +++--- src/subviews.jl | 12 ++++++------ 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/REQUIRE b/REQUIRE index 2c4ef82..df77a41 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1 +1,2 @@ julia 0.3 +Compat diff --git a/src/ArrayViews.jl b/src/ArrayViews.jl index e6310b6..33ed44a 100644 --- a/src/ArrayViews.jl +++ b/src/ArrayViews.jl @@ -2,6 +2,8 @@ VERSION >= v"0.4.0-dev+6521" && __precompile__(true) module ArrayViews +using Compat + import Base: eltype, ndims, size, length, stride, strides import Base: to_index, getindex, setindex!, parent, similar import Base: Ptr, pointer diff --git a/src/common.jl b/src/common.jl index 287ab70..2b4e409 100644 --- a/src/common.jl +++ b/src/common.jl @@ -27,9 +27,9 @@ type ContRank{M} end ## auxiliary union types to simplify method definition ## (for internal use only) -typealias Subs Union(Real,Colon,Range) -typealias SubsNC Union(Real,Range) -typealias SubsRange Union(Colon,Range) +@compat typealias Subs Union{Real,Colon,Range} +@compat typealias SubsNC Union{Real,Range} +@compat typealias SubsRange Union{Colon,Range} ### Common methods diff --git a/src/contrank.jl b/src/contrank.jl index a5c7539..a01cf31 100644 --- a/src/contrank.jl +++ b/src/contrank.jl @@ -33,17 +33,17 @@ restrict_crank{N}(::Type{ContRank{N}}, ::NTuple{0,Int}) = ContRank{0} contrank() = ContRank{0} # 1D -contrank(i::Union(Colon,UnitRange)) = ContRank{1} +@compat contrank(i::Union{Colon,UnitRange}) = ContRank{1} contrank(i::Subs) = ContRank{0} # 2D -contrank(i1::Colon, i2::Union(Colon,UnitRange)) = ContRank{2} +@compat contrank(i1::Colon, i2::Union{Colon,UnitRange}) = ContRank{2} contrank(i1::Colon, i2::Subs) = ContRank{1} contrank(i1::UnitRange, i2::Subs) = ContRank{1} contrank(i1::Subs, i2::Subs) = ContRank{0} # 3D -contrank(i1::Colon, i2::Colon, i3::Union(Colon,UnitRange)) = ContRank{3} +@compat contrank(i1::Colon, i2::Colon, i3::Union{Colon,UnitRange}) = ContRank{3} contrank(i1::Colon, i2::Colon, i3::Subs) = ContRank{2} contrank(i1::Colon, i2::UnitRange, i3::Subs) = ContRank{2} contrank(i1::Colon, i2::Subs, i3::Subs) = ContRank{1} diff --git a/src/convenience.jl b/src/convenience.jl index 3fd87ab..712e1f1 100644 --- a/src/convenience.jl +++ b/src/convenience.jl @@ -32,8 +32,8 @@ end ## ellipview -ellipview{T}(a::DenseArray{T,2}, i::Union(Integer, UnitRange)) = view(a, :, i) -ellipview{T}(a::DenseArray{T,3}, i::Union(Integer, UnitRange)) = view(a, :, :, i) -ellipview{T}(a::DenseArray{T,4}, i::Union(Integer, UnitRange)) = view(a, :, :, :, i) -ellipview{T}(a::DenseArray{T,5}, i::Union(Integer, UnitRange)) = view(a, :, :, :, :, i) -ellipview{T,N}(a::DenseArray{T,N}, i::Union(Integer, UnitRange)) = view(a, ntuple(i->Colon(),N-1)..., i) +@compat ellipview{T}(a::DenseArray{T,2}, i::Union{Integer, UnitRange}) = view(a, :, i) +@compat ellipview{T}(a::DenseArray{T,3}, i::Union{Integer, UnitRange}) = view(a, :, :, i) +@compat ellipview{T}(a::DenseArray{T,4}, i::Union{Integer, UnitRange}) = view(a, :, :, :, i) +@compat ellipview{T}(a::DenseArray{T,5}, i::Union{Integer, UnitRange}) = view(a, :, :, :, :, i) +@compat ellipview{T,N}(a::DenseArray{T,N}, i::Union{Integer, UnitRange}) = view(a, ntuple(i->Colon(),N-1)..., i) diff --git a/src/layout.jl b/src/layout.jl index 47ab9b0..77d3f05 100644 --- a/src/layout.jl +++ b/src/layout.jl @@ -1,9 +1,9 @@ # layout-related functions -typealias ContViews{T,N} Union(ContiguousView{T,N},UnsafeContiguousView{T,N}) -typealias NonContViews{T,N,M} Union(StridedView{T,N,M}, UnsafeStridedView{T,N,M}) +@compat typealias ContViews{T,N} Union{ContiguousView{T,N},UnsafeContiguousView{T,N}} +@compat typealias NonContViews{T,N,M} Union{StridedView{T,N,M}, UnsafeStridedView{T,N,M}} -typealias ContiguousArray{T,N} Union(Array{T,N}, ContiguousView{T,N}) +@compat typealias ContiguousArray{T,N} Union{Array{T,N}, ContiguousView{T,N}} typealias ContiguousVector{T} ContiguousArray{T,1} typealias ContiguousMatrix{T} ContiguousArray{T,2} diff --git a/src/subviews.jl b/src/subviews.jl index d158e29..eacbdbe 100644 --- a/src/subviews.jl +++ b/src/subviews.jl @@ -20,12 +20,12 @@ _step(i::Range) = step(i) # aoffset: offset w.r.t. the underlying array (i.e. parent) -aoffset(a::Union(Array, UnsafeArrayView), i::Subs) = roffset(a, i) -aoffset(a::Union(Array, UnsafeArrayView), i1::Subs, i2::Subs) = roffset(a, i1, i2) -aoffset(a::Union(Array, UnsafeArrayView), i1::Subs, i2::Subs, i3::Subs) = roffset(a, i1, i2, i3) -aoffset(a::Union(Array, UnsafeArrayView), i1::Subs, i2::Subs, i3::Subs, i4::Subs) = +@compat aoffset(a::Union{Array, UnsafeArrayView}, i::Subs) = roffset(a, i) +@compat aoffset(a::Union{Array, UnsafeArrayView}, i1::Subs, i2::Subs) = roffset(a, i1, i2) +@compat aoffset(a::Union{Array, UnsafeArrayView}, i1::Subs, i2::Subs, i3::Subs) = roffset(a, i1, i2, i3) +@compat aoffset(a::Union{Array, UnsafeArrayView}, i1::Subs, i2::Subs, i3::Subs, i4::Subs) = roffset(a, i1, i2, i3, i4) -aoffset(a::Union(Array, UnsafeArrayView), i1::Subs, i2::Subs, i3::Subs, i4::Subs, i5::Subs, I::Subs...) = +@compat aoffset(a::Union{Array, UnsafeArrayView}, i1::Subs, i2::Subs, i3::Subs, i4::Subs, i5::Subs, I::Subs...) = roffset(a, i1, i2, i3, i4, i5, I...) aoffset(a::ArrayView, i::Subs) = a.offset + roffset(a, i) @@ -211,7 +211,7 @@ vstrides(a::DenseArray, i::Subs) = (stride(a,1) * _step(i),) # 2D vstrides(a::ContiguousArray, i1::Subs, i2::Real) = (_step(i1),) -vstrides(a::ContiguousArray, i1::Subs, i2::Union(Colon,UnitRange)) = (_step(i1), stride(a,2)) +@compat vstrides(a::ContiguousArray, i1::Subs, i2::Union{Colon,UnitRange}) = (_step(i1), stride(a,2)) vstrides(a::ContiguousArray, i1::Subs, i2::Range) = (_step(i1), stride(a,2) * _step(i2)) vstrides(a::DenseArray, i1::Subs, i2::Real) = (stride(a,1) * _step(i1),)