From 7d5222ca7381800b7c5b50dd01692eab30f80c1d Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Mon, 26 Sep 2005 01:59:22 +0000
Subject: [PATCH] bootstrap fixes

---
 library/bootstrap/boot-stage1.factor | 4 ++--
 library/tools/annotations.factor     | 4 ++--
 library/tools/describe.factor        | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/library/bootstrap/boot-stage1.factor b/library/bootstrap/boot-stage1.factor
index 769b8c403f..02c710b359 100644
--- a/library/bootstrap/boot-stage1.factor
+++ b/library/bootstrap/boot-stage1.factor
@@ -93,8 +93,10 @@ sequences io vectors words ;
         "/library/alien/aliens.factor"
         
         "/library/syntax/prettyprint.factor"
+        "/library/syntax/see.factor"
 
         "/library/tools/interpreter.factor"
+        
         "/library/tools/describe.factor"
         "/library/tools/debugger.factor"
         "/library/tools/memory.factor"
@@ -105,8 +107,6 @@ sequences io vectors words ;
         "/library/tools/inspector.factor"
 
         "/library/test/test.factor"
-        
-        "/library/syntax/see.factor"
 
         "/library/threads.factor"
         
diff --git a/library/tools/annotations.factor b/library/tools/annotations.factor
index 507ee66aeb..a07f2284a4 100644
--- a/library/tools/annotations.factor
+++ b/library/tools/annotations.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2005 Slava Pestov.
 ! See http://factor.sf.net/license.txt for BSD license.
 IN: words
-USING: interpreter io kernel lists math namespaces prettyprint
-sequences strings test ;
+USING: interpreter inspector io kernel lists math namespaces
+prettyprint sequences strings test ;
 
 ! The annotation words let you flag a word for either tracing
 ! or single-stepping. Note that currently, words referring to
diff --git a/library/tools/describe.factor b/library/tools/describe.factor
index 985d71bffb..4a0c6df1d1 100644
--- a/library/tools/describe.factor
+++ b/library/tools/describe.factor
@@ -28,10 +28,14 @@ M: hashtable sheet dup hash-keys swap hash-values 2array ;
 : format-sheet ( sheet -- list )
     [ format-column ] map flip [ " " join ] map ;
 
-: describe ( object -- )
-    sheet dup format-sheet swap peek
+DEFER: describe
+
+: sheet. ( sheet -- )
+    dup format-sheet swap peek
     [ dup [ describe ] curry write-outliner ] 2each ;
 
+: describe ( object -- ) sheet sheet. ;
+
 : word. ( word -- )
     dup word-name swap dup [ see ] curry write-outliner ;