Merge pull request #17 from JuliaMath/teh/range

Support range(::ClosedInterval{<:Integer}) -> UnitRange

Author: timholy

.travis.yml

@@ -5,6 +5,7 @@ os:
   - osx
 julia:
   - 0.5
+  - 0.6
   - nightly
 notifications:
   email: false

appveyor.yml

@@ -2,6 +2,8 @@ environment:
   matrix:
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

src/IntervalSets.jl

@@ -5,7 +5,10 @@ module IntervalSets
 # package code goes here
 
 using Base: @pure
-import Base: eltype, convert, show, in, length, isempty, isequal, issubset, ==, hash, union, intersect, minimum, maximum
+import Base: eltype, convert, show, in, length, isempty, isequal, issubset, ==, hash, union, intersect, minimum, maximum, range
+if isdefined(Main, :⊇)
+    import Base: ⊇
+end
 
 using Compat
 
@@ -27,9 +30,6 @@ function convert{I<:AbstractInterval}(::Type{I}, r::Range)
     T = eltype(I)
     I(convert(T, minimum(r)), convert(T, maximum(r)))
 end
-function convert{R<:AbstractUnitRange,I<:Integer}(::Type{R}, i::AbstractInterval{I})
-    R(minimum(i), maximum(i))
-end
 
 ordered{T}(a::T, b::T) = ifelse(a < b, (a, b), (b, a))
 ordered(a, b) = ordered(promote(a, b)...)

src/closed.jl

@@ -76,3 +76,9 @@ function width{T}(A::ClosedInterval{T})
     _width = A.right - A.left
     max(zero(_width), _width)   # this works when T is a Date
 end
+
+function convert{R<:AbstractUnitRange,I<:Integer}(::Type{R}, i::ClosedInterval{I})
+    R(minimum(i), maximum(i))
+end
+
+range{I<:Integer}(i::ClosedInterval{I}) = convert(UnitRange{I}, i)

test/runtests.jl

@@ -10,21 +10,22 @@ using Base.Test
         @test_throws ArgumentError :a .. "b"
         I = 0..3
         @test string(I) == "0..3"
-        @test convert(UnitRange, I) === 0:3
-        @test convert(UnitRange{Int16}, I) === Int16(0):Int16(3)
+        @test @inferred(convert(UnitRange, I)) === 0:3
+        @test @inferred(range(I)) === 0:3
+        @test @inferred(convert(UnitRange{Int16}, I)) === Int16(0):Int16(3)
         J = 3..2
         K = 5..4
         L = 3 ± 2
-        M = ClosedInterval(2, 5.0)
+        M = @inferred(ClosedInterval(2, 5.0))
         @test string(M) == "2.0..5.0"
-        N = ClosedInterval(UInt8(255), 300)
-        O = CartesianIndex(1, 2, 3, 4) ± 2
+        N = @inferred(ClosedInterval(UInt8(255), 300))
+        O = @inferred(CartesianIndex(1, 2, 3, 4) ± 2)
         @test O == (-1..3, 0..4, 1..5, 2..6)
 
         @test eltype(I) == Int
         @test eltype(M) == Float64
-        @test convert(ClosedInterval{Float64}, I) === 0.0..3.0
-        @test convert(ClosedInterval{Float64}, 0:3) === 0.0..3.0
+        @test @inferred(convert(ClosedInterval{Float64}, I)) === 0.0..3.0
+        @test @inferred(convert(ClosedInterval{Float64}, 0:3)) === 0.0..3.0
         @test !(convert(ClosedInterval{Float64}, I) === 0..3)
         @test ClosedInterval{Float64}(1,3) === 1.0..3.0
         @test ClosedInterval(0.5..2.5) === 0.5..2.5
@@ -49,8 +50,8 @@ using Base.Test
         @test 2 in I
         @test 1..2 in 0.5..2.5
 
-        @test I ∪ L == ClosedInterval(0, 5)
-        @test I ∩ L == ClosedInterval(1, 3)
+        @test @inferred(I ∪ L) == ClosedInterval(0, 5)
+        @test @inferred(I ∩ L) == ClosedInterval(1, 3)
         @test isempty(J ∩ K)
         @test isempty((2..5) ∩ (7..10))
         @test isempty((1..10) ∩ (7..2))