From 9b045043acd434a0d224cb91455a4d8eaa3e34e6 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 29 Sep 2008 19:48:12 -0500 Subject: [PATCH] Fixing bugs, cleaning up --- basis/html/components/components-tests.factor | 2 +- basis/prettyprint/prettyprint.factor | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/basis/html/components/components-tests.factor b/basis/html/components/components-tests.factor index c0b7eec914..b4247e6e30 100644 --- a/basis/html/components/components-tests.factor +++ b/basis/html/components/components-tests.factor @@ -134,7 +134,7 @@ M: link-test link-href drop "http://www.apple.com/foo&bar" ; [ ] [ link-test "link" set-value ] unit-test [ "<Link Title>" ] [ - [ "link" link render ] with-string-writer + [ "link" link new render ] with-string-writer ] unit-test [ ] [ diff --git a/basis/prettyprint/prettyprint.factor b/basis/prettyprint/prettyprint.factor index c7be48084f..f63ce44c71 100755 --- a/basis/prettyprint/prettyprint.factor +++ b/basis/prettyprint/prettyprint.factor @@ -229,7 +229,7 @@ M: word declarations. : pprint-; ( -- ) \ ; pprint-word ; -: (see) ( spec -- ) +M: object see [ 12 nesting-limit set 100 length-limit set @@ -237,10 +237,7 @@ M: word declarations. dup definer nip [ pprint-word ] when* declarations. block> - ] with-scope ; - -M: object see - [ (see) ] with-use nl ; + ] with-use nl ; GENERIC: see-class* ( word -- ) @@ -328,10 +325,8 @@ M: word see dup class? over symbol? not and [ nl ] when - dup class? over symbol? and not [ - [ dup (see) ] with-use nl - ] when - drop ; + dup [ class? ] [ symbol? ] bi and + [ drop ] [ call-next-method ] if ; : see-all ( seq -- ) natural-sort [ nl ] [ see ] interleave ;