Merge pull request #1 from dantaras/bounds-error

Throw bounds error in pop! and popfirst!

Author: ancapdev

src/list.jl

@@ -6,7 +6,7 @@ end
 
 const IntrusiveList{T} = TaggedIntrusiveList{T, :default}
 
-@inline function checkbounds(list::IntrusiveList)
+@inline function checkbounds(list::TaggedIntrusiveList)
     isempty(list) && throw(BoundsError(list))
 end
 
@@ -67,7 +67,7 @@ function Base.push!(list::TaggedIntrusiveList{T, Tag}, node::T) where {T, Tag}
 end
 
 function Base.pop!(list::TaggedIntrusiveList{T, Tag}) where {T, Tag}
-    isempty(list) && throw(ArgumentError("list must be non-empty"))
+    @boundscheck checkbounds(list)
     head = list.head::T
     tail = getprev(head, Val{Tag}())::T
     if circlist_unlink!(tail, Val{Tag}()) === tail
@@ -87,7 +87,7 @@ function Base.pushfirst!(list::TaggedIntrusiveList{T, Tag}, node::T) where {T, T
 end
 
 function Base.popfirst!(list::TaggedIntrusiveList{T, Tag}) where {T, Tag}
-    isempty(list) && throw(ArgumentError("list must be non-empty"))
+    @boundscheck checkbounds(list)
     head = list.head::T
     new_head = circlist_unlink!(head, Val{Tag}())
     list.head = head === new_head ? nothing : new_head

src/slist.jl

@@ -6,7 +6,7 @@ end
 
 const IntrusiveSList{T} = TaggedIntrusiveSList{T, :default}
 
-@inline function checkbounds(list::IntrusiveSList)
+@inline function checkbounds(list::TaggedIntrusiveSList)
     isempty(list) && throw(BoundsError(list))
 end
 
@@ -76,7 +76,7 @@ function Base.push!(list::TaggedIntrusiveSList{T, Tag}, node::T) where {T, Tag}
 end
 
 function Base.pop!(list::TaggedIntrusiveSList{T, Tag}) where {T, Tag}
-    isempty(list) && throw(ArgumentError("slist must be non-empty"))
+    @boundscheck checkbounds(list)
     tail = list.tail::T
     head = getnext(tail, Val{Tag}())::T
     if head === tail
@@ -103,7 +103,7 @@ function Base.pushfirst!(list::TaggedIntrusiveSList{T, Tag}, node::T) where {T,
 end
 
 function Base.popfirst!(list::TaggedIntrusiveSList{T, Tag}) where {T, Tag}
-    isempty(list) && throw(ArgumentError("slist must be non-empty"))
+    @boundscheck checkbounds(list)
     tail = list.tail::T
     head = getnext(tail, Val{Tag}())::T
     if head === tail

test/list_tests.jl

@@ -59,7 +59,7 @@ list_types = [
     @test all([x for x in list] .=== [n1])
     @test pop!(list) === n1
     @test isempty(list)
-    @test_throws ArgumentError pop!(list)
+    @test_throws BoundsError pop!(list)
 end
 
 @testset "empty $ListType" for ListType in list_types