Merge pull request #427 from tynsh/master

Fix confusion in circular buffer

src/circular_buffer.jl

@@ -118,13 +118,11 @@ and overwrite back if full.
 """
 function pushfirst!(cb::CircularBuffer, data)
     # if full, decrement and overwrite, otherwise pushfirst
-    if length(cb) == cb.capacity
-        cb.first = (cb.first == 1 ? cb.capacity : cb.first - 1)
-        cb[1] = data
-    else
+    cb.first = (cb.first == 1 ? cb.capacity : cb.first - 1)
+    if length(cb) < cb.capacity
         cb.length += 1
-        pushfirst!(cb.buffer, data)
     end
+    cb.buffer[cb.first] = data
     cb
 end
 

test/test_circular_buffer.jl

@@ -57,6 +57,16 @@
         end
     end
 
+    @testset "Issue 429" begin
+        cb = CircularBuffer{Int}(5)
+        map(x -> pushfirst!(cb, x), 1:8)
+        pop!(cb)
+        pushfirst!(cb, 9)
+        @test length(cb.buffer) == cb.capacity
+        arr = convert(Array, cb)
+        @test arr == Int[9, 8, 7, 6, 5]
+    end
+
     @testset "Issue 379" begin
         cb = CircularBuffer{Int}(5)
         pushfirst!(cb, 1)