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

sets: adding clear-set.

db4
John Benediktsson 2013-03-07 18:48:15 -08:00
parent b571a42679
commit f46bf3ac5d
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/hash-sets/hash-sets.factor
View File

@ -25,6 +25,7 @@ M: hash-set cardinality table>> assoc-size ;
M: hash-set intersect small/large sequence/tester filter >hash-set ; M: hash-set intersect small/large sequence/tester filter >hash-set ;
M: hash-set union (union) >hash-set ; M: hash-set union (union) >hash-set ;
M: hash-set diff sequence/tester [ not ] compose filter >hash-set ; M: hash-set diff sequence/tester [ not ] compose filter >hash-set ;
M: hash-set clear-set table>> clear-assoc ;
M: sequence fast-set >hash-set ; M: sequence fast-set >hash-set ;
M: f fast-set drop H{ } clone hash-set boa ; M: f fast-set drop H{ } clone hash-set boa ;

6
core/sets/sets-docs.factor
View File

@ -24,6 +24,7 @@ ARTICLE: "set-operations" "Operations on sets"
{ $subsections { $subsections
adjoin adjoin
delete delete
clear-set
} }
"To test if a set is the empty set:" "To test if a set is the empty set:"
{ $subsections null? } { $subsections null? }
@ -97,6 +98,11 @@ HELP: delete
{ $description "Destructively removes " { $snippet "elt" } " from " { $snippet "set" } ". If the element is not present, this does nothing." $nl "Each mutable set type is expected to implement a method on this generic word." } { $description "Destructively removes " { $snippet "elt" } " from " { $snippet "set" } ". If the element is not present, this does nothing." $nl "Each mutable set type is expected to implement a method on this generic word." }
{ $side-effects "set" } ; { $side-effects "set" } ;
HELP: clear-set
{ $values { "set" set } }
{ $contract "Removes all entries from the set." }
{ $side-effects "set" } ;
HELP: members HELP: members
{ $values { "set" set } { "seq" sequence } } { $values { "set" set } { "seq" sequence } }
{ $description "Creates a sequence with a single copy of each member of the set." $nl "Each set type is expected to implement a method on this generic word." } ; { $description "Creates a sequence with a single copy of each member of the set." $nl "Each set type is expected to implement a method on this generic word." } ;

3
core/sets/sets-tests.factor
View File

@ -123,3 +123,6 @@ M: null-set members drop f ;
[ t ] [ { } set? ] unit-test [ t ] [ { } set? ] unit-test
[ t ] [ 5 <bit-set> set? ] unit-test [ t ] [ 5 <bit-set> set? ] unit-test
[ f ] [ H{ } set? ] unit-test [ f ] [ H{ } set? ] unit-test
[ HS{ } ] [ HS{ } [ clear-set ] keep ] unit-test
[ HS{ } ] [ HS{ 1 2 3 } [ clear-set ] keep ] unit-test

8
core/sets/sets.factor
View File

@ -22,9 +22,12 @@ GENERIC: duplicates ( set -- seq )
GENERIC: all-unique? ( set -- ? ) GENERIC: all-unique? ( set -- ? )
GENERIC: null? ( set -- ? ) GENERIC: null? ( set -- ? )
GENERIC: cardinality ( set -- n ) GENERIC: cardinality ( set -- n )
GENERIC: clear-set ( set -- )
M: f cardinality drop 0 ; M: f cardinality drop 0 ;
M: f clear-set drop ; inline
! Defaults for some methods. ! Defaults for some methods.
! Override them for efficiency ! Override them for efficiency
@ -32,6 +35,8 @@ M: set null? members null? ; inline
M: set cardinality members length ; M: set cardinality members length ;
M: set clear-set [ members ] keep [ delete ] curry each ;
M: set set-like drop ; inline M: set set-like drop ; inline
<PRIVATE <PRIVATE
@ -125,6 +130,9 @@ M: sequence null?
M: sequence cardinality M: sequence cardinality
fast-set cardinality ; fast-set cardinality ;
M: sequence clear-set
delete-all ; inline
: combine ( sets -- set/f ) : combine ( sets -- set/f )
[ f ] [ f ]
[ [ [ ?members ] map concat ] [ first ] bi set-like ] [ [ [ ?members ] map concat ] [ first ] bi set-like ]