Restrict findin for ranges to integer ranges. Support ranges with ste…

…p 0 in findin.
halleysfifthinc · May 15, 2013 · 82b6419 · 82b6419
1 parent d9c995c
commit 82b6419
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/base/range.jl b/base/range.jl
@@ -232,7 +232,7 @@ function intersect(r::Ranges, s::Ranges...)
 end
 
 # findin (the index of intersection)
-function findin(r::Ranges, span::Range1)
+function findin{T1<:Integer, T2<:Integer}(r::Ranges{T1}, span::Range1{T2})
  local ifirst
  local ilast
  fspan = first(span)
@@ -243,9 +243,12 @@ function findin(r::Ranges, span::Range1)
  if sr > 0
  ifirst = fr >= fspan ? 1 : iceil((fspan-fr)/sr)+1
  ilast = lr <= lspan ? length(r) : length(r) - iceil((lr-lspan)/sr)
- else
+ elseif sr < 0
  ifirst = fr <= lspan ? 1 : iceil((lspan-fr)/sr)+1
  ilast = lr >= fspan ? length(r) : length(r) - iceil((lr-fspan)/sr)
+ else
+ ifirst = fr >= fspan ? 1 : length(r)+1
+ ilast = fr <= lspan ? length(r) : 0
  end
  ifirst:ilast
 end

diff --git a/test/corelib.jl b/test/corelib.jl
@@ -36,6 +36,12 @@ let
  r = 15:-2:-38
  @test findin(r, span) == 1:6
 end
+@test isempty(findin(5+0*(1:6), 2:4))
+@test findin(5+0*(1:6), 2:5) == 1:6
+@test findin(5+0*(1:6), 2:7) == 1:6
+@test findin(5+0*(1:6), 5:7) == 1:6
+@test isempty(findin(5+0*(1:6), 6:7))
+@test findin(5+0*(1:6), 5:5) == 1:6
 
 @test intersect(1:5, 2:3) == 2:3
 @test intersect(-3:5, 2:8) == 2:5