From bc5bc22072f8c1833e82f4631c8ef601e972a183 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Wed, 23 Jan 2008 06:31:30 -0400
Subject: [PATCH] Better dlists behavior

---
 core/dlists/dlists.factor | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/dlists/dlists.factor b/core/dlists/dlists.factor
index a3c869efaf..84d68b28aa 100755
--- a/core/dlists/dlists.factor
+++ b/core/dlists/dlists.factor
@@ -78,7 +78,8 @@ PRIVATE>
 
 : pop-front ( dlist -- obj )
     dup dlist-front [
-        dlist-node-next
+        dup dlist-node-next
+        f rot set-dlist-node-next
         f over set-prev-when
         swap set-dlist-front
     ] 2keep dlist-node-obj
@@ -87,13 +88,13 @@ PRIVATE>
 : pop-front* ( dlist -- ) pop-front drop ;
 
 : pop-back ( dlist -- obj )
-    [
-        dlist-back dup dlist-node-prev f over set-next-when
-    ] keep
-    [ set-dlist-back ] keep
-    [ normalize-front ] keep
-    dec-length
-    dlist-node-obj ;
+    dup dlist-back [
+        dup dlist-node-prev
+        f rot set-dlist-node-prev
+        f over set-next-when
+        swap set-dlist-back
+    ] 2keep dlist-node-obj
+    swap [ normalize-front ] keep dec-length ;
 
 : pop-back* ( dlist -- ) pop-back drop ;