X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=extra%2Fadsoda%2Fcombinators%2Fcombinators.factor;h=d00eebc9763497ba1bced13f7d38161774874bdc;hp=4e4bbff72d57d8d3135263d8951e9d4ec19d6e42;hb=3f3d57032bf29190e9bee12d168a4bce6d74653c;hpb=cd1bb8f4c8afba318249c7b756a45aa1c46ea51e diff --git a/extra/adsoda/combinators/combinators.factor b/extra/adsoda/combinators/combinators.factor index 4e4bbff72d..d00eebc976 100755 --- a/extra/adsoda/combinators/combinators.factor +++ b/extra/adsoda/combinators/combinators.factor @@ -13,7 +13,7 @@ IN: adsoda.combinators ! { [ dup 0 = ] [ 2drop { { } } ] } ! { [ over empty? ] [ 2drop { } ] } ! { [ t ] [ -! [ [ 1- (combinations) ] [ drop first ] 2bi prefix-each ] +! [ [ 1 - (combinations) ] [ drop first ] 2bi prefix-each ] ! [ (combinations) ] 2bi append ! ] } ! } cond ; @@ -26,7 +26,7 @@ IN: adsoda.combinators { [ over 1 = ] [ 3drop columnize ] } { [ over 0 = ] [ 2drop 2drop { } ] } { [ 2dup < ] [ 2drop [ 1 cut ] dip - [ 1- among [ append ] with map ] + [ 1 - among [ append ] with map ] [ among append ] 2bi ] } { [ 2dup = ] [ 3drop 1array ] }