From: John Benediktsson Date: Sun, 17 Apr 2016 20:08:32 +0000 (-0700) Subject: lists: first pass at some cleanup. X-Git-Tag: unmaintained~1169 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=42ae9ac0155d204be23446ac09efca7b35721bcc lists: first pass at some cleanup. Now lists.lazy:lmap-lazy and lists.lazy:lappend-lazy names differentiate from their non-lazy counterparts in lists. --- diff --git a/basis/lists/lazy/examples/examples.factor b/basis/lists/lazy/examples/examples.factor index 11047f3e7c..25ec00baea 100644 --- a/basis/lists/lazy/examples/examples.factor +++ b/basis/lists/lazy/examples/examples.factor @@ -11,5 +11,5 @@ IN: lists.lazy.examples : odds ( -- list ) 1 lfrom [ 2 mod 1 = ] lfilter ; : powers-of-2 ( -- list ) 1 [ 2 * ] lfrom-by ; : ones ( -- list ) 1 [ ] lfrom-by ; -: squares ( -- list ) naturals [ dup * ] lazy-map ; +: squares ( -- list ) naturals [ dup * ] lmap-lazy ; : first-five-squares ( -- list ) 5 squares ltake list>array ; diff --git a/basis/lists/lazy/lazy-docs.factor b/basis/lists/lazy/lazy-docs.factor index 56c2554381..24f3aa31e3 100644 --- a/basis/lists/lazy/lazy-docs.factor +++ b/basis/lists/lazy/lazy-docs.factor @@ -18,7 +18,7 @@ ARTICLE: "lists.lazy" "Lazy lists" ARTICLE: { "lists.lazy" "combinators" } "Combinators for manipulating lazy lists" "The following combinators create lazy lists from other lazy lists:" { $subsections - lazy-map + lmap-lazy lfilter luntil lwhile @@ -50,7 +50,7 @@ ARTICLE: { "lists.lazy" "manipulation" } "Manipulating lazy lists" "To make new lazy lists from old ones:" { $subsections - lappend + lappend-lazy lconcat lcartesian-product lcartesian-product* @@ -82,31 +82,31 @@ HELP: { $description "Constructs a cons object that wraps an existing cons object. Requests for the car, cdr and nil? will be remembered after the first call, and the previous result returned on subsequent calls." } { $see-also cons car cdr nil nil? } ; -{ lazy-map ltake lfilter lappend lfrom lfrom-by lconcat lcartesian-product lcartesian-product* lcomp lcomp* lmerge lwhile luntil } related-words +{ lmap-lazy ltake lfilter lappend-lazy lfrom lfrom-by lconcat lcartesian-product lcartesian-product* lcomp lcomp* lmerge lwhile luntil } related-words -HELP: lazy-map +HELP: lmap-lazy { $values { "list" "a cons object" } { "quot" { $quotation ( obj -- X ) } } { "result" "resulting cons object" } } -{ $description "Perform a similar functionality to that of the " { $link map } " word, but in a lazy manner. No evaluation of the list elements occurs initially but a " { $link } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; +{ $description "Perform a similar functionality to that of the " { $link map } " word, but in a lazy manner. No evaluation of the list elements occurs initially but a " { $link lazy-map } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; HELP: ltake { $values { "n" "a non negative integer" } { "list" "a cons object" } { "result" "resulting cons object" } } -{ $description "Outputs a lazy list containing the first n items in the list. This is done a lazy manner. No evaluation of the list elements occurs initially but a " { $link } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; +{ $description "Outputs a lazy list containing the first n items in the list. This is done a lazy manner. No evaluation of the list elements occurs initially but a " { $link lazy-take } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; HELP: lfilter { $values { "list" "a cons object" } { "quot" { $quotation ( -- X ) } } { "result" "resulting cons object" } } -{ $description "Perform a similar functionality to that of the " { $link filter } " word, but in a lazy manner. No evaluation of the list elements occurs initially but a " { $link } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; +{ $description "Perform a similar functionality to that of the " { $link filter } " word, but in a lazy manner. No evaluation of the list elements occurs initially but a " { $link lazy-filter } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; HELP: lwhile { $values { "list" "a cons object" } { "quot" { $quotation ( x -- ? ) } } { "result" "resulting cons object" } } -{ $description "Outputs a lazy list containing the first items in the list as long as " { $snippet "quot" } " evaluates to t. No evaluation of the list elements occurs initially but a " { $link } " object is returned with conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; +{ $description "Outputs a lazy list containing the first items in the list as long as " { $snippet "quot" } " evaluates to t. No evaluation of the list elements occurs initially but a " { $link lazy-while } " object is returned with conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; HELP: luntil { $values { "list" "a cons object" } { "quot" { $quotation ( x -- ? ) } } { "result" "resulting cons object" } } -{ $description "Outputs a lazy list containing the first items in the list until after " { $snippet "quot" } " evaluates to t. No evaluation of the list elements occurs initially but a " { $link } " object is returned with conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; +{ $description "Outputs a lazy list containing the first items in the list until after " { $snippet "quot" } " evaluates to t. No evaluation of the list elements occurs initially but a " { $link lazy-while } " object is returned with conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required." } ; -HELP: lappend +HELP: lappend-lazy { $values { "list1" "a cons object" } { "list2" "a cons object" } { "result" "a lazy list of list2 appended to list1" } } -{ $description "Perform a similar functionality to that of the " { $link append } " word, but in a lazy manner. No evaluation of the list elements occurs initially but a " { $link } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required. Successive calls to " { $link cdr } " will iterate through list1, followed by list2." } ; +{ $description "Perform a similar functionality to that of the " { $link append } " word, but in a lazy manner. No evaluation of the list elements occurs initially but a " { $link lazy-append } " object is returned which conforms to the list protocol. Calling " { $link car } ", " { $link cdr } " or " { $link nil? } " on this will evaluate elements as required. Successive calls to " { $link cdr } " will iterate through list1, followed by list2." } ; HELP: lfrom-by { $values { "n" integer } { "quot" { $quotation ( n -- o ) } } { "lazy-from-by" "a lazy list of integers" } } @@ -121,7 +121,7 @@ HELP: sequence-tail>list { $description "Convert the sequence into a list, starting from " { $snippet "index" } "." } { $see-also >list } ; -{ leach foldl lazy-map ltake lfilter lappend lfrom lfrom-by lconcat lcartesian-product lcartesian-product* lcomp lcomp* lmerge lwhile luntil } related-words +{ leach foldl lmap-lazy ltake lfilter lappend-lazy lfrom lfrom-by lconcat lcartesian-product lcartesian-product* lcomp lcomp* lmerge lwhile luntil } related-words HELP: lconcat { $values { "list" "a list of lists" } { "result" "a list" } } diff --git a/basis/lists/lazy/lazy-tests.factor b/basis/lists/lazy/lazy-tests.factor index 5d00701a14..499c945944 100644 --- a/basis/lists/lazy/lazy-tests.factor +++ b/basis/lists/lazy/lazy-tests.factor @@ -25,7 +25,7 @@ IN: lists.lazy.tests ] unit-test { { 4 5 6 } } [ - 3 { 1 2 3 } >list [ + ] with lazy-map list>array + 3 { 1 2 3 } >list [ + ] with lmap-lazy list>array ] unit-test { { 1 2 4 8 16 } } [ diff --git a/basis/lists/lazy/lazy.factor b/basis/lists/lazy/lazy.factor index a6d1dfd20c..d6f7004d66 100644 --- a/basis/lists/lazy/lazy.factor +++ b/basis/lists/lazy/lazy.factor @@ -4,31 +4,27 @@ USING: accessors arrays combinators io kernel lists math promises quotations sequences ; IN: lists.lazy -M: promise car ( promise -- car ) - force car ; +M: promise car force car ; -M: promise cdr ( promise -- cdr ) - force cdr ; +M: promise cdr force cdr ; -M: promise nil? ( cons -- ? ) - force nil? ; +M: promise nil? force nil? ; -! Both 'car' and 'cdr' are promises -TUPLE: lazy-cons-state car cdr ; +TUPLE: lazy-cons-state + { car promise } + { cdr promise } ; + +C: lazy-cons-state : lazy-cons ( car cdr -- promise ) - [ T{ promise f f t f } clone ] 2dip - [ ] bi@ \ lazy-cons-state boa - >>value ; + [ ] bi@ + [ f t ] dip promise boa ; -M: lazy-cons-state car ( lazy-cons -- car ) - car>> force ; +M: lazy-cons-state car car>> force ; -M: lazy-cons-state cdr ( lazy-cons -- cdr ) - cdr>> force ; +M: lazy-cons-state cdr cdr>> force ; -M: lazy-cons-state nil? ( lazy-cons -- ? ) - nil eq? ; +M: lazy-cons-state nil? nil eq? ; : 1lazy-list ( a -- lazy-cons ) [ nil ] lazy-cons ; @@ -41,49 +37,47 @@ M: lazy-cons-state nil? ( lazy-cons -- ? ) TUPLE: memoized-cons original car cdr nil? ; -: not-memoized ( -- obj ) { } ; - -: not-memoized? ( obj -- ? ) not-memoized eq? ; +SYMBOL: +not-memoized+ : ( cons -- memoized-cons ) - not-memoized not-memoized not-memoized + +not-memoized+ +not-memoized+ +not-memoized+ memoized-cons boa ; -M: memoized-cons car ( memoized-cons -- car ) - dup car>> not-memoized? [ +M: memoized-cons car + dup car>> +not-memoized+ eq? [ dup original>> car [ >>car drop ] keep ] [ car>> ] if ; -M: memoized-cons cdr ( memoized-cons -- cdr ) - dup cdr>> not-memoized? [ +M: memoized-cons cdr + dup cdr>> +not-memoized+ eq? [ dup original>> cdr [ >>cdr drop ] keep ] [ cdr>> ] if ; -M: memoized-cons nil? ( memoized-cons -- ? ) - dup nil?>> not-memoized? [ - dup original>> nil? [ >>nil? drop ] keep +M: memoized-cons nil? + dup nil?>> +not-memoized+ eq? [ + dup original>> nil? [ >>nil? drop ] keep ] [ nil?>> ] if ; -TUPLE: lazy-map-state cons quot ; +TUPLE: lazy-map cons quot ; -C: lazy-map-state +C: lazy-map -: lazy-map ( list quot -- result ) - over nil? [ 2drop nil ] [ ] if ; +: lmap-lazy ( list quot -- result ) + over nil? [ 2drop nil ] [ ] if ; -M: lazy-map-state car ( lazy-map -- car ) +M: lazy-map car [ cons>> car ] [ quot>> call( old -- new ) ] bi ; -M: lazy-map-state cdr ( lazy-map -- cdr ) - [ cons>> cdr ] [ quot>> lazy-map ] bi ; +M: lazy-map cdr + [ cons>> cdr ] [ quot>> lmap-lazy ] bi ; -M: lazy-map-state nil? ( lazy-map -- ? ) +M: lazy-map nil? cons>> nil? ; TUPLE: lazy-take n cons ; @@ -93,14 +87,13 @@ C: lazy-take : ltake ( n list -- result ) over zero? [ 2drop nil ] [ ] if ; -M: lazy-take car ( lazy-take -- car ) +M: lazy-take car cons>> car ; -M: lazy-take cdr ( lazy-take -- cdr ) - [ n>> 1 - ] keep - cons>> cdr ltake ; +M: lazy-take cdr + [ n>> 1 - ] [ cons>> cdr ltake ] bi ; -M: lazy-take nil? ( lazy-take -- ? ) +M: lazy-take nil? dup n>> zero? [ drop t ] [ cons>> nil? ] if ; TUPLE: lazy-until cons quot ; @@ -110,15 +103,15 @@ C: lazy-until : luntil ( list quot -- result ) over nil? [ drop ] [ ] if ; -M: lazy-until car ( lazy-until -- car ) +M: lazy-until car cons>> car ; -M: lazy-until cdr ( lazy-until -- cdr ) +M: lazy-until cdr [ [ cons>> cdr ] [ quot>> ] bi ] [ [ cons>> car ] [ quot>> ] bi call( elt -- ? ) ] bi [ 2drop nil ] [ luntil ] if ; -M: lazy-until nil? ( lazy-until -- ? ) +M: lazy-until nil? drop f ; TUPLE: lazy-while cons quot ; @@ -128,13 +121,13 @@ C: lazy-while : lwhile ( list quot -- result ) over nil? [ drop ] [ ] if ; -M: lazy-while car ( lazy-while -- car ) +M: lazy-while car cons>> car ; -M: lazy-while cdr ( lazy-while -- cdr ) +M: lazy-while cdr [ cons>> cdr ] keep quot>> lwhile ; -M: lazy-while nil? ( lazy-while -- ? ) +M: lazy-while nil? [ car ] keep quot>> call( elt -- ? ) not ; TUPLE: lazy-filter cons quot ; @@ -144,47 +137,47 @@ C: lazy-filter : lfilter ( list quot -- result ) over nil? [ 2drop nil ] [ ] if ; +> car ] [ quot>> ] bi call( elt -- ? ) ; : skip ( lazy-filter -- ) dup cons>> cdr >>cons drop ; -M: lazy-filter car ( lazy-filter -- car ) +PRIVATE> + +M: lazy-filter car dup car-filter? [ cons>> ] [ dup skip ] if car ; -M: lazy-filter cdr ( lazy-filter -- cdr ) +M: lazy-filter cdr dup car-filter? [ [ cons>> cdr ] [ quot>> ] bi lfilter ] [ dup skip cdr ] if ; -M: lazy-filter nil? ( lazy-filter -- ? ) - dup cons>> nil? [ - drop t - ] [ - dup car-filter? [ - drop f - ] [ - dup skip nil? - ] if - ] if ; +M: lazy-filter nil? + { + { [ dup cons>> nil? ] [ drop t ] } + { [ dup car-filter? ] [ drop f ] } + [ dup skip nil? ] + } cond ; TUPLE: lazy-append list1 list2 ; C: lazy-append -: lappend ( list1 list2 -- result ) +: lappend-lazy ( list1 list2 -- result ) over nil? [ nip ] [ ] if ; -M: lazy-append car ( lazy-append -- car ) +M: lazy-append car list1>> car ; -M: lazy-append cdr ( lazy-append -- cdr ) - [ list1>> cdr ] [ list2>> ] bi lappend ; +M: lazy-append cdr + [ list1>> cdr ] [ list2>> ] bi lappend-lazy ; -M: lazy-append nil? ( lazy-append -- ? ) +M: lazy-append nil? drop f ; TUPLE: lazy-from-by n quot ; @@ -194,14 +187,13 @@ TUPLE: lazy-from-by n quot ; : lfrom ( n -- list ) [ 1 + ] lfrom-by ; -M: lazy-from-by car ( lazy-from-by -- car ) +M: lazy-from-by car n>> ; -M: lazy-from-by cdr ( lazy-from-by -- cdr ) - [ n>> ] keep - quot>> [ call( old -- new ) ] keep lfrom-by ; +M: lazy-from-by cdr + [ n>> ] [ quot>> ] bi [ call( old -- new ) ] keep lfrom-by ; -M: lazy-from-by nil? ( lazy-from-by -- ? ) +M: lazy-from-by nil? drop f ; TUPLE: lazy-zip list1 list2 ; @@ -209,17 +201,17 @@ TUPLE: lazy-zip list1 list2 ; C: lazy-zip : lzip ( list1 list2 -- lazy-zip ) - over nil? over nil? or - [ 2drop nil ] [ ] if ; + over nil? over nil? or + [ 2drop nil ] [ ] if ; -M: lazy-zip car ( lazy-zip -- car ) - [ list1>> car ] keep list2>> car 2array ; +M: lazy-zip car + [ list1>> car ] keep list2>> car 2array ; -M: lazy-zip cdr ( lazy-zip -- cdr ) - [ list1>> cdr ] keep list2>> cdr lzip ; +M: lazy-zip cdr + [ list1>> cdr ] keep list2>> cdr lzip ; -M: lazy-zip nil? ( lazy-zip -- ? ) - drop f ; +M: lazy-zip nil? + drop f ; TUPLE: sequence-cons index seq ; @@ -232,13 +224,13 @@ C: sequence-cons ] if ; -M: sequence-cons car ( sequence-cons -- car ) +M: sequence-cons car [ index>> ] [ seq>> nth ] bi ; -M: sequence-cons cdr ( sequence-cons -- cdr ) +M: sequence-cons cdr [ index>> 1 + ] [ seq>> sequence-tail>list ] bi ; -M: sequence-cons nil? ( sequence-cons -- ? ) +M: sequence-cons nil? drop f ; M: sequence >list 0 swap sequence-tail>list ; @@ -255,17 +247,17 @@ DEFER: lconcat : lconcat ( list -- result ) dup nil? [ drop nil ] [ uncons (lconcat) ] if ; -M: lazy-concat car ( lazy-concat -- car ) +M: lazy-concat car car>> car ; -M: lazy-concat cdr ( lazy-concat -- cdr ) +M: lazy-concat cdr [ car>> cdr ] keep cdr>> (lconcat) ; -M: lazy-concat nil? ( lazy-concat -- ? ) +M: lazy-concat nil? dup car>> nil? [ cdr>> nil? ] [ drop f ] if ; : lcartesian-product ( list1 list2 -- result ) - swap [ swap [ 2array ] with lazy-map ] with lazy-map lconcat ; + swap [ swap [ 2array ] with lmap-lazy ] with lmap-lazy lconcat ; : lcartesian-product* ( lists -- result ) dup nil? [ @@ -274,15 +266,15 @@ M: lazy-concat nil? ( lazy-concat -- ? ) uncons [ car lcartesian-product ] [ cdr ] bi list>array swap [ - swap [ swap [ suffix ] with lazy-map ] with lazy-map lconcat + swap [ swap [ suffix ] with lmap-lazy ] with lmap-lazy lconcat ] reduce ] if ; : lcomp ( list quot -- result ) - [ lcartesian-product* ] dip lazy-map ; + [ lcartesian-product* ] dip lmap-lazy ; : lcomp* ( list guards quot -- result ) - [ [ lcartesian-product* ] dip [ lfilter ] each ] dip lazy-map ; + [ [ lcartesian-product* ] dip [ lfilter ] each ] dip lmap-lazy ; DEFER: lmerge @@ -312,7 +304,7 @@ C: lazy-io : llines ( stream -- result ) f f [ stream-readln ] ; -M: lazy-io car ( lazy-io -- car ) +M: lazy-io car dup car>> [ nip ] [ @@ -320,21 +312,19 @@ M: lazy-io car ( lazy-io -- car ) call( stream -- value ) [ >>car ] [ drop nil ] if* ] if* ; -M: lazy-io cdr ( lazy-io -- cdr ) +M: lazy-io cdr dup cdr>> dup [ nip ] [ - drop dup - [ stream>> ] - [ quot>> ] - [ car ] tri [ + drop dup [ stream>> ] [ quot>> ] [ car ] tri + [ [ f f ] dip [ >>cdr drop ] keep ] [ 3drop nil ] if ] if ; -M: lazy-io nil? ( lazy-io -- ? ) +M: lazy-io nil? car nil? ; INSTANCE: sequence-cons list @@ -343,7 +333,7 @@ INSTANCE: promise list INSTANCE: lazy-io list INSTANCE: lazy-concat list INSTANCE: lazy-cons-state list -INSTANCE: lazy-map-state list +INSTANCE: lazy-map list INSTANCE: lazy-take list INSTANCE: lazy-append list INSTANCE: lazy-from-by list diff --git a/basis/lists/lists-docs.factor b/basis/lists/lists-docs.factor index f0cdf4c2e7..28cd82c639 100644 --- a/basis/lists/lists-docs.factor +++ b/basis/lists/lists-docs.factor @@ -159,7 +159,7 @@ HELP: cadr HELP: lappend { $values { "list1" list } { "list2" list } { "newlist" list } } -{ $description "Appends the two lists to form a new list. The first list must be finite. The result is a strict cons cell, and the first list is exausted." } ; +{ $description "Appends the two lists to form a new list. The first list must be finite. The result is a strict cons cell, and the first list is exhausted." } ; HELP: lcut { $values { "list" list } { "index" integer } { "before" cons } { "after" cons } } diff --git a/basis/lists/lists.factor b/basis/lists/lists.factor index 0efb182864..29181a9da4 100644 --- a/basis/lists/lists.factor +++ b/basis/lists/lists.factor @@ -42,7 +42,7 @@ M: object nil? drop f ; : cadr ( list -- elt ) cdr car ; inline -: 2car ( list -- car caar ) [ car ] [ cadr ] bi ; inline +: 2car ( list -- car cadr ) [ car ] [ cadr ] bi ; inline : 3car ( list -- car cadr caddr ) [ car ] [ cadr ] [ cdr cadr ] tri ; inline diff --git a/extra/monads/monads.factor b/extra/monads/monads.factor index 73e2b98eb2..d8d4e35a35 100644 --- a/extra/monads/monads.factor +++ b/extra/monads/monads.factor @@ -127,7 +127,7 @@ M: list-monad fail 2drop nil ; M: list monad-of drop list-monad ; -M: list >>= '[ _ swap lazy-map lconcat ] ; +M: list >>= '[ _ swap lmap-lazy lconcat ] ; ! State SINGLETON: state-monad diff --git a/extra/parser-combinators/parser-combinators.factor b/extra/parser-combinators/parser-combinators.factor index 39db45eb4a..d44cb530f3 100644 --- a/extra/parser-combinators/parser-combinators.factor +++ b/extra/parser-combinators/parser-combinators.factor @@ -151,8 +151,8 @@ TUPLE: and-parser parsers ; [ parsed>> ] dip [ parsed>> 2array ] keep unparsed>> - ] with lazy-map - ] with lazy-map lconcat ; + ] with lmap-lazy + ] with lmap-lazy lconcat ; M: and-parser parse ( input parser -- list ) ! Parse 'input' by sequentially combining the @@ -175,7 +175,7 @@ M: or-parser parse ( input parser1 -- list ) ! of parser1 and parser2 being applied to the same ! input. This implements the choice parsing operator. parsers>> sequence>list - [ parse ] with lazy-map lconcat ; + [ parse ] with lmap-lazy lconcat ; : trim-head-slice ( string -- string ) ! Return a new string without any leading whitespace @@ -220,7 +220,7 @@ M: apply-parser parse ( input parser -- result ) -rot parse [ [ parsed>> swap call ] keep unparsed>> - ] with lazy-map ; + ] with lmap-lazy ; TUPLE: some-parser p1 ; diff --git a/extra/project-euler/065/065.factor b/extra/project-euler/065/065.factor index dc6617617e..5973d9b81c 100644 --- a/extra/project-euler/065/065.factor +++ b/extra/project-euler/065/065.factor @@ -60,7 +60,7 @@ IN: project-euler.065 : (e-frac) ( -- seq ) 2 lfrom [ dup 3 mod zero? [ 3 / 2 * ] [ drop 1 ] if - ] lazy-map ; + ] lmap-lazy ; : e-frac ( n -- n ) 1 - (e-frac) ltake list>array reverse 0 diff --git a/extra/rosetta-code/hamming-lazy/hamming-lazy.factor b/extra/rosetta-code/hamming-lazy/hamming-lazy.factor index 55cf30059f..e6b37bddf6 100644 --- a/extra/rosetta-code/hamming-lazy/hamming-lazy.factor +++ b/extra/rosetta-code/hamming-lazy/hamming-lazy.factor @@ -32,6 +32,6 @@ IN: rosetta-code.hamming-lazy :: hamming ( -- hamming ) f :> h! [ 1 ] [ - h 2 3 5 [ '[ _ * ] lazy-map ] tri-curry@ tri + h 2 3 5 [ '[ _ * ] lmap-lazy ] tri-curry@ tri sort-merge sort-merge ] lazy-cons h! h ;