]> gitweb.factorcode.org Git - factor.git/commitdiff
search-deques: simplify pop-front* and pop-back*.
authorJohn Benediktsson <mrjbq7@gmail.com>
Fri, 23 May 2014 20:55:46 +0000 (13:55 -0700)
committerJohn Benediktsson <mrjbq7@gmail.com>
Fri, 23 May 2014 20:55:46 +0000 (13:55 -0700)
basis/search-deques/search-deques.factor

index 1f2924e200ab31cfb7c6519e9fcc32f908c4ea4e..84b49e92660f9791b28f0d2ea55468076ebae2a1 100644 (file)
@@ -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 ]