diff --git a/basis/classes/struct/prettyprint/prettyprint.factor b/basis/classes/struct/prettyprint/prettyprint.factor index 1769fafe06..85c6f1d0a2 100644 --- a/basis/classes/struct/prettyprint/prettyprint.factor +++ b/basis/classes/struct/prettyprint/prettyprint.factor @@ -28,11 +28,7 @@ IN: classes.struct.prettyprint [ [ \ S{ ] dip [ class ] [ struct>assoc ] bi \ } (pprint-tuple) ] ?pprint-tuple ; : pprint-struct-pointer ( struct -- ) - c-ptr pprint* ] bi - block> ; + \ S@ [ [ class pprint-word ] [ >c-ptr pprint* ] bi ] pprint-prefix ; PRIVATE> diff --git a/basis/specialized-arrays/direct/functor/functor.factor b/basis/specialized-arrays/direct/functor/functor.factor index 7bab05d931..5731fd8c17 100755 --- a/basis/specialized-arrays/direct/functor/functor.factor +++ b/basis/specialized-arrays/direct/functor/functor.factor @@ -9,10 +9,7 @@ IN: specialized-arrays.direct.functor > ] [ length>> ] bi [ pprint* ] bi@ - block> ; + [ [ underlying>> ] [ length>> ] bi [ pprint* ] bi@ ] pprint-prefix ; PRIVATE> diff --git a/basis/struct-arrays/prettyprint/prettyprint.factor b/basis/struct-arrays/prettyprint/prettyprint.factor index 6ffb764d12..77fb6847a0 100644 --- a/basis/struct-arrays/prettyprint/prettyprint.factor +++ b/basis/struct-arrays/prettyprint/prettyprint.factor @@ -10,10 +10,9 @@ M: struct-array >pprint-sequence [ >array ] [ class>> ] bi prefix ; : pprint-struct-array-pointer ( struct-array -- ) - > ] [ underlying>> ] [ length>> ] tri [ pprint* ] tri@ - block> ; + \ struct-array@ + [ [ class>> pprint-word ] [ underlying>> pprint* ] [ length>> pprint* ] tri ] + pprint-prefix ; M: struct-array pprint* [ pprint-object ]