search-deques: simplify pop-front* and pop-back*.

db4
John Benediktsson 2014-05-23 13:55:46 -07:00
parent 1f607f0573
commit dff051696e
1 changed files with 3 additions and 7 deletions

View File

@ -1,6 +1,6 @@
! Copyright (C) 2008 Slava Pestov. ! Copyright (C) 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors kernel assocs deques ; USING: accessors assocs deques kernel ;
IN: search-deques IN: search-deques
TUPLE: search-deque assoc deque ; TUPLE: search-deque assoc deque ;
@ -28,14 +28,10 @@ M: search-deque push-back*
] if ; ] if ;
M: search-deque pop-front* M: search-deque pop-front*
[ [ deque>> peek-front ] [ assoc>> ] bi delete-at ] [ deque>> pop-front ] [ assoc>> ] bi delete-at ;
[ deque>> pop-front* ]
bi ;
M: search-deque pop-back* M: search-deque pop-back*
[ [ deque>> peek-back ] [ assoc>> ] bi delete-at ] [ deque>> pop-back ] [ assoc>> ] bi delete-at ;
[ deque>> pop-back* ]
bi ;
M: search-deque delete-node M: search-deque delete-node
[ deque>> delete-node ] [ deque>> delete-node ]