From e1e457c27e658d343031d34753a0faaa22704bb9 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sun, 30 Aug 2009 21:12:02 -0500
Subject: [PATCH] pprint S@, X-array@ in <block block> for better formatting

---
 basis/classes/struct/prettyprint/prettyprint.factor    | 4 +++-
 basis/specialized-arrays/direct/functor/functor.factor | 7 +++++--
 basis/struct-arrays/prettyprint/prettyprint.factor     | 6 ++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/basis/classes/struct/prettyprint/prettyprint.factor b/basis/classes/struct/prettyprint/prettyprint.factor
index d2ae17b9ce..1769fafe06 100644
--- a/basis/classes/struct/prettyprint/prettyprint.factor
+++ b/basis/classes/struct/prettyprint/prettyprint.factor
@@ -28,9 +28,11 @@ IN: classes.struct.prettyprint
     [ [ \ S{ ] dip [ class ] [ struct>assoc ] bi \ } (pprint-tuple) ] ?pprint-tuple ;
 
 : pprint-struct-pointer ( struct -- )
+    <block
     \ S@ pprint-word
     [ class pprint-word ]
-    [ >c-ptr pprint* ] bi ;
+    [ >c-ptr pprint* ] bi
+    block> ;
 
 PRIVATE>
 
diff --git a/basis/specialized-arrays/direct/functor/functor.factor b/basis/specialized-arrays/direct/functor/functor.factor
index 9003b87e03..7bab05d931 100755
--- a/basis/specialized-arrays/direct/functor/functor.factor
+++ b/basis/specialized-arrays/direct/functor/functor.factor
@@ -2,14 +2,17 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: functors sequences sequences.private kernel words classes
 math alien alien.c-types byte-arrays accessors
-specialized-arrays parser prettyprint.backend prettyprint.custom ;
+specialized-arrays parser
+prettyprint.backend prettyprint.custom prettyprint.sections ;
 IN: specialized-arrays.direct.functor
 
 <PRIVATE
 
 : pprint-direct-array ( direct-array tag -- )
+    <block
     pprint-word
-    [ underlying>> ] [ length>> ] bi [ pprint* ] bi@ ;
+    [ underlying>> ] [ length>> ] bi [ pprint* ] bi@
+    block> ;
 
 PRIVATE>
 
diff --git a/basis/struct-arrays/prettyprint/prettyprint.factor b/basis/struct-arrays/prettyprint/prettyprint.factor
index dcf57fb454..6ffb764d12 100644
--- a/basis/struct-arrays/prettyprint/prettyprint.factor
+++ b/basis/struct-arrays/prettyprint/prettyprint.factor
@@ -1,6 +1,6 @@
 ! (c)Joe Groff bsd license
 USING: accessors arrays kernel prettyprint.backend
-prettyprint.custom sequences struct-arrays ;
+prettyprint.custom prettyprint.sections sequences struct-arrays ;
 IN: struct-arrays.prettyprint
 
 M: struct-array pprint-delims
@@ -10,8 +10,10 @@ M: struct-array >pprint-sequence
     [ >array ] [ class>> ] bi prefix ;
 
 : pprint-struct-array-pointer ( struct-array -- )
+    <block
     \ struct-array@ pprint-word 
-    [ class>> ] [ underlying>> ] [ length>> ] tri [ pprint* ] tri@ ;
+    [ class>> ] [ underlying>> ] [ length>> ] tri [ pprint* ] tri@
+    block> ;
 
 M: struct-array pprint*
     [ pprint-object ]