From c7fa671c0c3479fecfe3e2a4110d53dd81378d7c Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 15 Sep 2009 18:56:17 -0500 Subject: [PATCH] Revert "make struct classes print properly in the status bar" This reverts commit 4ee1a4f9e8590eb8846343dc5d30d9f5e3aaee26. --- .../struct/prettyprint/prettyprint.factor | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/basis/classes/struct/prettyprint/prettyprint.factor b/basis/classes/struct/prettyprint/prettyprint.factor index 8bda9dc5f9..e88834530c 100644 --- a/basis/classes/struct/prettyprint/prettyprint.factor +++ b/basis/classes/struct/prettyprint/prettyprint.factor @@ -1,13 +1,18 @@ ! (c)Joe Groff bsd license USING: accessors alien alien.c-types arrays assocs classes classes.struct combinators combinators.short-circuit continuations -definitions fry kernel libc make math math.parser mirrors -prettyprint.backend prettyprint.custom prettyprint.sections -see see.private sequences slots strings summary words ; +fry kernel libc make math math.parser mirrors prettyprint.backend +prettyprint.custom prettyprint.sections see.private sequences +slots strings summary words ; IN: classes.struct.prettyprint = + [ second offset>> 0 = \ UNION-STRUCT: \ STRUCT: ? ] + [ drop \ STRUCT: ] if ; + : struct>assoc ( struct -- assoc ) [ class struct-slots ] [ struct-slot-values ] bi zip ; @@ -34,14 +39,8 @@ IN: classes.struct.prettyprint PRIVATE> -M: struct-class definer - struct-slots dup length 2 >= - [ second offset>> 0 = \ UNION-STRUCT: \ STRUCT: ? ] - [ drop \ STRUCT: ] if - \ ; ; - M: struct-class see-class* - pprint-; block> ;