steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor >list to be a generic word

db4
Iskander Sitdikov 2014-09-29 02:20:50 +04:00 committed by John Benediktsson
parent 8d6df6d128
commit edff21ada3
4 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/lists/lazy/lazy-docs.factor
View File

@ -121,11 +121,6 @@ HELP: sequence-tail>list
{ $description "Convert the sequence into a list, starting from " { $snippet "index" } "." } { $description "Convert the sequence into a list, starting from " { $snippet "index" } "." }
{ $see-also >list } ; { $see-also >list } ;
HELP: >list
{ $values { "object" object } { "list" "a list" } }
{ $description "Convert the object into a list. Existing lists are passed through intact, sequences are converted using " { $link sequence-tail>list } " and other objects cause an error to be thrown." }
{ $see-also sequence-tail>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 lazy-map ltake lfilter lappend lfrom lfrom-by lconcat lcartesian-product lcartesian-product* lcomp lcomp* lmerge lwhile luntil } related-words
HELP: lconcat HELP: lconcat

14
basis/lists/lazy/lazy.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2004, 2008 Chris Double, Matthew Willis, James Cash. ! Copyright (C) 2004, 2008 Chris Double, Matthew Willis, James Cash.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays combinators io kernel lists math USING: accessors arrays combinators io kernel lists math
promises quotations sequences summary vectors ; promises quotations sequences vectors ;
IN: lists.lazy IN: lists.lazy
M: promise car ( promise -- car ) M: promise car ( promise -- car )
@ -241,17 +241,7 @@ M: sequence-cons cdr ( sequence-cons -- cdr )
M: sequence-cons nil? ( sequence-cons -- ? ) M: sequence-cons nil? ( sequence-cons -- ? )
drop f ; drop f ;
ERROR: list-conversion-error object ; M: sequence >list 0 swap sequence-tail>list ;
M: list-conversion-error summary
drop "Could not convert object to list" ;
: >list ( object -- list )
{
{ [ dup sequence? ] [ 0 swap sequence-tail>list ] }
{ [ dup list? ] [ ] }
[ list-conversion-error ]
} cond ;
TUPLE: lazy-concat car cdr ; TUPLE: lazy-concat car cdr ;

3
basis/lists/lists-docs.factor
View File

@ -169,3 +169,6 @@ HELP: lmap>array
{ $values { "list" list } { "quot" quotation } { "array" array } } { $values { "list" list } { "quot" quotation } { "array" array } }
{ $description "Executes the quotation on each element of the list, collecting the results in an array." } ; { $description "Executes the quotation on each element of the list, collecting the results in an array." } ;
HELP: >list
{ $values { "object" object } { "list" "a list" } }
{ $description "Converts the object into a list." } ;

6
basis/lists/lists.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2008 James Cash, Daniel Ehrenberg, Chris Double. ! Copyright (C) 2008 James Cash, Daniel Ehrenberg, Chris Double.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel sequences accessors math arrays vectors classes words USING: kernel sequences accessors math arrays vectors classes words
combinators.short-circuit combinators locals ; combinators.short-circuit combinators locals summary ;
IN: lists IN: lists
! List Protocol ! List Protocol
@ -95,3 +95,7 @@ PRIVATE>
INSTANCE: cons-state list INSTANCE: cons-state list
INSTANCE: +nil+ list INSTANCE: +nil+ list
GENERIC: >list ( object -- list )
M: list >list ;