Merge pull request #20169 from JuliaLang/teh/convert_cr

Convert CartesianRange back to Tuple{UnitRange...}

Author: timholy

base/multidimensional.jl

@@ -4,7 +4,7 @@
 module IteratorsMD
     import Base: eltype, length, size, start, done, next, last, in, getindex,
                  setindex!, linearindexing, min, max, zero, one, isless, eachindex,
-                 ndims, iteratorsize
+                 ndims, iteratorsize, convert
 
     importall ..Base.Operators
     import Base: simd_outer_range, simd_inner_length, simd_index
@@ -88,6 +88,15 @@ module IteratorsMD
     CartesianRange{N}(rngs::NTuple{N,Union{Integer,AbstractUnitRange}}) =
         CartesianRange(CartesianIndex(map(first, rngs)), CartesianIndex(map(last, rngs)))
 
+    convert{N}(::Type{NTuple{N,UnitRange{Int}}}, R::CartesianRange{CartesianIndex{N}}) =
+        map((f,l)->f:l, first(R).I, last(R).I)
+    convert{N}(::Type{NTuple{N,UnitRange}}, R::CartesianRange) =
+        convert(NTuple{N,UnitRange{Int}}, R)
+    convert{N}(::Type{Tuple{Vararg{UnitRange{Int}}}}, R::CartesianRange{CartesianIndex{N}}) =
+        convert(NTuple{N,UnitRange{Int}}, R)
+    convert(::Type{Tuple{Vararg{UnitRange}}}, R::CartesianRange) =
+        convert(Tuple{Vararg{UnitRange{Int}}}, R)
+
     ndims(R::CartesianRange) = length(R.start)
     ndims{I<:CartesianIndex}(::Type{CartesianRange{I}}) = length(I)
 

test/arrayops.jl

@@ -1449,6 +1449,9 @@ end
     @test !in(CartesianIndex((3,6)), R)
     @test !in(CartesianIndex((6,5)), R)
 
+    @test @inferred(convert(NTuple{2,UnitRange}, R)) === (2:5, 3:5)
+    @test @inferred(convert(Tuple{Vararg{UnitRange}}, R)) === (2:5, 3:5)
+
     @test CartesianRange((3:5,-7:7)) == CartesianRange(CartesianIndex{2}(3,-7),CartesianIndex{2}(5,7))
     @test CartesianRange((3,-7:7)) == CartesianRange(CartesianIndex{2}(3,-7),CartesianIndex{2}(3,7))
 end