From c1803e1a4e0a3cec044defa33b7458719e2ecc34 Mon Sep 17 00:00:00 2001 From: slava Date: Fri, 19 May 2006 19:29:22 +0000 Subject: [PATCH] Fix word style, and NSOpenPanel crash --- TODO.FACTOR.txt | 2 -- library/cocoa/dialogs.factor | 5 ++--- library/syntax/prettyprint.factor | 5 ++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt index 0e7e5aae3c..684c4d6eaf 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -1,7 +1,5 @@ - remove F_USERENV rel -- cocoa exceptions are broken - method ordering and interpreter algorithm sections need updates -- run file dialog is broken - update walker for new interpreter - quotations should store their originating word - core foundation should use unicode strings diff --git a/library/cocoa/dialogs.factor b/library/cocoa/dialogs.factor index 6b802519b5..94ed38c2f0 100644 --- a/library/cocoa/dialogs.factor +++ b/library/cocoa/dialogs.factor @@ -9,12 +9,11 @@ sequences ; dup 1 [setCanChooseFiles:] dup 0 [setCanChooseDirectories:] dup 1 [setResolvesAliases:] - dup 1 [setAllowsMultipleSelection:] - [autorelease] ; + dup 1 [setAllowsMultipleSelection:] ; : NSOKButton 1 ; : NSCancelButton 0 ; : open-panel ( -- paths ) dup f [runModalForTypes:] NSOKButton = - [ [filenames] CF>array [ CF>string ] map ] [ f ] if ; + [ [filenames] CF>array [ CF>string ] map ] [ drop f ] if ; diff --git a/library/syntax/prettyprint.factor b/library/syntax/prettyprint.factor index d4b9ac4001..bf34318bbe 100644 --- a/library/syntax/prettyprint.factor +++ b/library/syntax/prettyprint.factor @@ -158,7 +158,10 @@ M: block pprint-section* ( block -- ) GENERIC: pprint* ( obj -- ) : word-style ( word -- style ) - parsing? H{ { font-style bold } } H{ } ? ; + [ + dup presented set + parsing? [ bold font-style set ] when + ] make-hash ; : pprint-word ( obj -- ) dup word-name [ "( ? )" ] unless*