From 9320a69451aca2ad6ddd27ef95a7fbf81cee11e9 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 24 Nov 2007 22:29:22 -0600 Subject: [PATCH 1/3] Fix unit test, change quotation? to callable? --- extra/lint/lint.factor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extra/lint/lint.factor b/extra/lint/lint.factor index bd2be801fd..75f6abb9ae 100644 --- a/extra/lint/lint.factor +++ b/extra/lint/lint.factor @@ -13,7 +13,7 @@ SYMBOL: def-hash-keys 2dup at -rot >r >r ?push r> r> set-at ; : add-word-def ( word quot -- ) - dup quotation? [ + dup callable? [ def-hash get-global set-hash-vector ] [ 2drop @@ -33,6 +33,7 @@ SYMBOL: def-hash-keys { [ drop drop drop ] 3drop } { [ 0 = ] zero? } { [ pop drop ] pop* } + { [ [ ] if ] when } } [ first2 swap add-word-def ] each ; : accessor-words ( -- seq ) @@ -108,13 +109,13 @@ M: object lint ( obj -- seq ) : subseq/member? ( subseq/member seq -- ? ) { [ 2dup start ] [ 2dup member? ] } || 2nip ; -M: quotation lint ( quot -- seq ) +M: callable lint ( quot -- seq ) def-hash-keys get [ swap subseq/member? ] curry* subset ; M: word lint ( word -- seq ) - word-def dup quotation? [ lint ] [ drop f ] if ; + word-def dup callable? [ lint ] [ drop f ] if ; : word-path. ( word -- ) [ word-vocabulary ":" ] keep unparse 3append write nl ; From aa25860b5b5890c442e866353f4e9be52aec561c Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 24 Nov 2007 22:34:53 -0600 Subject: [PATCH 2/3] Fix typo --- misc/factor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/factor.sh b/misc/factor.sh index a95ac6ce1e..98f9104549 100755 --- a/misc/factor.sh +++ b/misc/factor.sh @@ -148,7 +148,7 @@ set_build_info() { MAKE_TARGET=$OS-$ARCH-$WORD BOOT_IMAGE=boot.$ARCH.$WORD.image - if [[ $OS == macosx && $ARCH=ppc ]] ; then + if [[ $OS == macosx && $ARCH == ppc ]] ; then MAKE_TARGET=$OS-$ARCH BOOT_IMAGE=boot.macosx-ppc.image fi From 40dd61c0f20b166210cfee54af20bd496dccb7dc Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 24 Nov 2007 22:44:47 -0600 Subject: [PATCH 3/3] notepadpp was in the wrong vocab --- extra/editors/notepadpp/notepadpp.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/editors/notepadpp/notepadpp.factor b/extra/editors/notepadpp/notepadpp.factor index 080910731d..42f0568c3a 100644 --- a/extra/editors/notepadpp/notepadpp.factor +++ b/extra/editors/notepadpp/notepadpp.factor @@ -1,5 +1,5 @@ USING: editors io.launcher math.parser namespaces ; -IN: notepadpp +IN: editors.notepadpp : notepadpp ( file line -- ) [