From a7e713764f92e14c493bd8ac4c819924ff9e0ae9 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Mon, 25 Jul 2005 03:09:43 +0000
Subject: [PATCH] improved inspector with slot links

---
 library/tools/inspector.factor | 22 +++++++++++++---------
 library/ui/layouts.factor      |  4 ++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/library/tools/inspector.factor b/library/tools/inspector.factor
index 47dfa1ed40..300feb3edf 100644
--- a/library/tools/inspector.factor
+++ b/library/tools/inspector.factor
@@ -2,8 +2,8 @@
 ! See http://factor.sf.net/license.txt for BSD license.
 IN: inspector
 USING: generic hashtables io kernel kernel-internals lists math
-memory namespaces prettyprint sequences strings test unparser
-vectors words ;
+memory namespaces prettyprint sequences strings styles test
+unparser vectors words ;
 
 SYMBOL: inspecting
 
@@ -16,11 +16,11 @@ M: object sheet ( obj -- sheet )
 
 PREDICATE: list nonvoid cons? ;
 
-M: nonvoid sheet >list unit ;
+M: nonvoid sheet unit ;
 
-M: vector sheet >list unit ;
+M: vector sheet unit ;
 
-M: array sheet >list unit ;
+M: array sheet unit ;
 
 M: hashtable sheet hash>alist unzip 2list ;
 
@@ -29,8 +29,8 @@ M: hashtable sheet hash>alist unzip 2list ;
     [ [ length ] map 0 [ max ] reduce ] keep
     [ swap CHAR: \s pad-right ] map-with ;
 
-: describe ( obj -- list )
-    sheet dup first length count swons
+: format-sheet ( sheet -- list )
+    dup first length count swons
     dup peek over first [ set ] 2each
     [ column ] map
     seq-transpose
@@ -68,6 +68,10 @@ M: object extra-banner ( obj -- ) drop ;
     "It takes up " write dup size unparse write " bytes of memory." print
     extra-banner ;
 
+: describe ( obj -- )
+    sheet dup format-sheet
+    swap peek [ presented swons unit ] map
+    [ format terpri ] 2each ;
+
 : inspect ( obj -- )
-    dup inspecting set
-    dup inspect-banner describe [ print ] each ;
+    dup inspecting set dup inspect-banner describe ;
diff --git a/library/ui/layouts.factor b/library/ui/layouts.factor
index 6b68458c5e..f1cbf27f3f 100644
--- a/library/ui/layouts.factor
+++ b/library/ui/layouts.factor
@@ -22,8 +22,8 @@ TUPLE: pack align fill vector ;
 : pref-dims ( gadget -- list )
     gadget-children [ pref-dim ] map ;
 
-: orient ( gadget list1 list2 -- list )
-    zip >r pack-vector r> [ uncons rot set-axis ] map-with ;
+: orient ( gadget seq1 seq2 -- seq )
+    >r >r pack-vector r> r> [ pick set-axis ] 2map nip ;
 
 : packed-dim-2 ( gadget sizes -- list )
     [