From 2c41d24991c41613e5a202ff67e16b383bb77d21 Mon Sep 17 00:00:00 2001 From: Jon Harper Date: Mon, 10 May 2010 01:49:21 +0200 Subject: [PATCH 1/2] remove duplicates to conform with lint-tool --- basis/tools/scaffold/scaffold.factor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor index 17df1a13f2..8cf76c6de4 100644 --- a/basis/tools/scaffold/scaffold.factor +++ b/basis/tools/scaffold/scaffold.factor @@ -7,6 +7,7 @@ math.parser io.streams.string ui.tools.operations quotations strings arrays prettyprint words vocabs sorting sets classes math alien urls splitting ascii combinators.short-circuit timers words.symbol system summary ; +FROM: sets => members ; IN: tools.scaffold SYMBOL: developer-name @@ -170,6 +171,7 @@ M: bad-developer-name summary 2dup [ empty? ] bi@ and [ 2drop ] [ + [ members ] dip over diff "{ $values" print [ 4bl ($values.) ] [ [ nl 4bl ($values.) ] unless-empty ] bi* From 95aaccc6a108a9fb08937f138775ab1c94f010ec Mon Sep 17 00:00:00 2001 From: Jon Harper Date: Mon, 10 May 2010 01:52:46 +0200 Subject: [PATCH 2/2] Remove redundant newline --- basis/tools/scaffold/scaffold.factor | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor index 8cf76c6de4..6c7c4528bf 100644 --- a/basis/tools/scaffold/scaffold.factor +++ b/basis/tools/scaffold/scaffold.factor @@ -165,6 +165,9 @@ M: bad-developer-name summary : 4bl ( -- ) " " write ; inline +: ?print-nl ( seq1 seq2 -- ) + { [ nip empty? ] [ drop empty? ] } 2|| not + [ nl ] when ; : $values. ( word -- ) "declared-effect" word-prop [ [ in>> ] [ out>> ] bi @@ -173,8 +176,9 @@ M: bad-developer-name summary ] [ [ members ] dip over diff "{ $values" print - [ 4bl ($values.) ] - [ [ nl 4bl ($values.) ] unless-empty ] bi* + [ drop 4bl ($values.) ] + [ ?print-nl ] + [ nip 4bl ($values.) ] 2tri nl "}" print ] if ] when* ;