From dff051696eb3ecda883a12e3f056257cf50406e8 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 23 May 2014 13:55:46 -0700 Subject: [PATCH] search-deques: simplify pop-front* and pop-back*. --- basis/search-deques/search-deques.factor | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/basis/search-deques/search-deques.factor b/basis/search-deques/search-deques.factor index 1f2924e200..84b49e9266 100644 --- a/basis/search-deques/search-deques.factor +++ b/basis/search-deques/search-deques.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel assocs deques ; +USING: accessors assocs deques kernel ; IN: search-deques TUPLE: search-deque assoc deque ; @@ -28,14 +28,10 @@ M: search-deque push-back* ] if ; M: search-deque pop-front* - [ [ deque>> peek-front ] [ assoc>> ] bi delete-at ] - [ deque>> pop-front* ] - bi ; + [ deque>> pop-front ] [ assoc>> ] bi delete-at ; M: search-deque pop-back* - [ [ deque>> peek-back ] [ assoc>> ] bi delete-at ] - [ deque>> pop-back* ] - bi ; + [ deque>> pop-back ] [ assoc>> ] bi delete-at ; M: search-deque delete-node [ deque>> delete-node ]