Fix pop! with negative numbers

JuliaLang · Jul 22, 2015 · be2c6ea · be2c6ea
1 parent 3126831
commit be2c6ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/base/intset.jl b/base/intset.jl
@@ -78,6 +78,9 @@ function pop!(s::IntSet, n::Integer, deflt)
             return deflt
         end
     end
+    if n < 0
+        return deflt
+    end
     mask = UInt32(1)<<(n&31)
     idx = n>>5 + 1
     b = s.bits[idx]

diff --git a/test/intset.jl b/test/intset.jl
@@ -26,6 +26,7 @@ s = IntSet([0,1,10,20,200,300,1000,10000,10002])
 @test first(s) == 0
 @test length(s) == 9
 @test pop!(s) == 10002
+@test_throws KeyError pop!(s, -1)
 @test length(s) == 8
 @test shift!(s) == 0
 @test length(s) == 7