From f44d8f4cf51b7073fd3eb99de4f21291ef079f5c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 18 Nov 2008 11:45:55 -0600
Subject: [PATCH] Fix combinators so that directory. can infer on Unix

---
 basis/unix/groups/groups.factor | 6 ++++--
 basis/unix/users/users.factor   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/basis/unix/groups/groups.factor b/basis/unix/groups/groups.factor
index b8edf7fa36..177949aec9 100644
--- a/basis/unix/groups/groups.factor
+++ b/basis/unix/groups/groups.factor
@@ -76,9 +76,11 @@ M: integer user-groups ( id -- seq )
 : all-groups ( -- seq )
     [ getgrent dup ] [ group-struct>group ] [ drop ] produce ;
 
+: <group-cache> ( -- assoc )
+    all-groups [ [ id>> ] keep ] H{ } map>assoc ;
+
 : with-group-cache ( quot -- )
-    all-groups [ [ id>> ] keep ] H{ } map>assoc
-    group-cache rot with-variable ; inline
+    [ <group-cache> group-cache ] dip with-variable ; inline
 
 : real-group-id ( -- id )
     getgid ; inline
diff --git a/basis/unix/users/users.factor b/basis/unix/users/users.factor
index f76fbd5388..8487d5adf2 100644
--- a/basis/unix/users/users.factor
+++ b/basis/unix/users/users.factor
@@ -41,9 +41,11 @@ PRIVATE>
 
 SYMBOL: user-cache
 
+: <user-cache> ( -- assoc )
+    all-users [ [ uid>> ] keep ] H{ } map>assoc ;
+
 : with-user-cache ( quot -- )
-    all-users [ [ uid>> ] keep ] H{ } map>assoc
-    user-cache rot with-variable ; inline
+    [ <user-cache> user-cache ] dip with-variable ; inline
 
 GENERIC: user-passwd ( obj -- passwd )