From 229ad789071e2485eef9773deeb528d521faa835 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 15 Jun 2008 00:32:48 -0500
Subject: [PATCH] Slight cleanup

---
 core/assocs/assocs.factor       | 21 ++++++++++-----------
 core/sequences/sequences.factor |  7 ++++---
 extra/sequences/lib/lib.factor  |  3 ---
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor
index c875475278..f56ac810d9 100755
--- a/core/assocs/assocs.factor
+++ b/core/assocs/assocs.factor
@@ -20,26 +20,25 @@ GENERIC: assoc-clone-like ( assoc exemplar -- newassoc )
 
 GENERIC: >alist ( assoc -- newassoc )
 
+: (assoc-each) ( assoc quot -- seq quot' )
+    >r >alist r> [ first2 ] prepose ; inline
+
 : assoc-find ( assoc quot -- key value ? )
-    >r >alist r> [ first2 ] prepose find swap
-    [ first2 t ] [ drop f f f ] if ; inline
+    (assoc-each) find swap [ first2 t ] [ drop f f f ] if ; inline
 
 : key? ( key assoc -- ? ) at* nip ; inline
 
 : assoc-each ( assoc quot -- )
-    [ f ] compose assoc-find 3drop ; inline
-
-: (assoc>map) ( quot accum -- quot' )
-    [ push ] curry compose ; inline
+    (assoc-each) each ; inline
 
 : assoc>map ( assoc quot exemplar -- seq )
-    >r over assoc-size
-    <vector> [ (assoc>map) assoc-each ] keep
-    r> like ; inline
+    >r accumulator >r assoc-each r> r> like ; inline
+
+: assoc-map-as ( assoc quot exemplar -- newassoc )
+    >r [ 2array ] compose V{ } assoc>map r> assoc-like ; inline
 
 : assoc-map ( assoc quot -- newassoc )
-    over >r [ 2array ] compose V{ } assoc>map r> assoc-like ;
-    inline
+    over assoc-map-as ; inline
 
 : assoc-push-if ( key value quot accum -- )
     >r 2keep r> roll
diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index cb33552693..02a7191f0a 100755
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -419,10 +419,11 @@ PRIVATE>
 : interleave ( seq between quot -- )
     [ (interleave) ] 2curry >r dup length swap r> 2each ; inline
 
+: accumulator ( quot -- quot' vec )
+    V{ } clone [ [ push ] curry compose ] keep ; inline
+
 : unfold ( pred quot tail -- seq )
-    V{ } clone [
-        swap >r [ push ] curry compose r> while
-    ] keep { } like ; inline
+    swap accumulator >r swap while r> { } like ; inline
 
 : follow ( obj quot -- seq )
     >r [ dup ] r> [ keep ] curry [ ] unfold nip ; inline
diff --git a/extra/sequences/lib/lib.factor b/extra/sequences/lib/lib.factor
index ed4c337a92..56488818ab 100755
--- a/extra/sequences/lib/lib.factor
+++ b/extra/sequences/lib/lib.factor
@@ -201,9 +201,6 @@ USE: continuations
     >r >r 0 max r> r>
     [ length tuck min >r min r> ] keep subseq ;
 
-: accumulator ( quot -- quot vec )
-    V{ } clone [ [ push ] curry compose ] keep ; inline
-
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 ! List the positions of obj in seq