Changing some uses of prune to use members

db4
Daniel Ehrenberg 2010-02-27 13:14:03 -05:00
parent 7ad324837b
commit 434605c0b5
7 changed files with 13 additions and 11 deletions

View File

@ -7,6 +7,7 @@ stack-checker.branches
compiler.tree compiler.tree
compiler.tree.combinators ; compiler.tree.combinators ;
FROM: namespaces => set ; FROM: namespaces => set ;
FROM: sets => members ;
IN: compiler.tree.def-use IN: compiler.tree.def-use
SYMBOL: def-use SYMBOL: def-use
@ -43,7 +44,7 @@ GENERIC: node-uses-values ( node -- values )
M: #introduce node-uses-values drop f ; M: #introduce node-uses-values drop f ;
M: #push node-uses-values drop f ; M: #push node-uses-values drop f ;
M: #phi node-uses-values phi-in-d>> concat remove-bottom prune ; M: #phi node-uses-values phi-in-d>> concat remove-bottom members ;
M: #declare node-uses-values drop f ; M: #declare node-uses-values drop f ;
M: #terminate node-uses-values [ in-d>> ] [ in-r>> ] bi append ; M: #terminate node-uses-values [ in-d>> ] [ in-r>> ] bi append ;
M: #shuffle node-uses-values [ in-d>> ] [ in-r>> ] bi append ; M: #shuffle node-uses-values [ in-d>> ] [ in-r>> ] bi append ;

View File

@ -6,6 +6,7 @@ help help.markup help.topics io.streams.string kernel macros
namespaces sequences sequences.deep sets sorting splitting namespaces sequences sequences.deep sets sorting splitting
strings unicode.categories values vocabs vocabs.loader words strings unicode.categories values vocabs vocabs.loader words
words.symbol summary debugger io ; words.symbol summary debugger io ;
FROM: sets => members ;
IN: help.lint.checks IN: help.lint.checks
ERROR: simple-lint-error message ; ERROR: simple-lint-error message ;
@ -39,7 +40,7 @@ SYMBOL: vocab-articles
: effect-values ( word -- seq ) : effect-values ( word -- seq )
stack-effect stack-effect
[ in>> ] [ out>> ] bi append [ in>> ] [ out>> ] bi append
[ dup pair? [ first ] when effect>string ] map prune ; [ dup pair? [ first ] when effect>string ] map members ;
: contains-funky-elements? ( element -- ? ) : contains-funky-elements? ( element -- ? )
{ {
@ -80,7 +81,7 @@ SYMBOL: vocab-articles
: check-see-also ( element -- ) : check-see-also ( element -- )
\ $see-also swap elements [ \ $see-also swap elements [
rest dup prune [ length ] bi@ assert= rest all-unique? t assert=
] each ; ] each ;
: vocab-exists? ( name -- ? ) : vocab-exists? ( name -- ? )

View File

@ -442,7 +442,7 @@ M: array elements*
: elements ( elt-type element -- seq ) [ elements* ] { } make ; : elements ( elt-type element -- seq ) [ elements* ] { } make ;
: collect-elements ( element seq -- elements ) : collect-elements ( element seq -- elements )
swap '[ _ elements [ rest ] map concat ] map concat prune ; swap '[ _ elements [ rest ] map concat ] gather ;
: <$link> ( topic -- element ) : <$link> ( topic -- element )
1array \ $link prefix ; 1array \ $link prefix ;

View File

@ -81,7 +81,7 @@ M: linux-monitor dispose* ( monitor -- )
IN_MOVED_FROM +rename-file-old+ ?flag IN_MOVED_FROM +rename-file-old+ ?flag
IN_MOVED_TO +rename-file-new+ ?flag IN_MOVED_TO +rename-file-new+ ?flag
drop drop
] { } make prune ; ] { } make members ;
: parse-event-name ( event -- name ) : parse-event-name ( event -- name )
dup len>> zero? dup len>> zero?

View File

@ -18,7 +18,7 @@ GENERIC: rewrite-closures* ( obj -- )
GENERIC: defs-vars* ( seq form -- seq' ) GENERIC: defs-vars* ( seq form -- seq' )
: defs-vars ( form -- vars ) { } [ defs-vars* ] reduce prune ; : defs-vars ( form -- vars ) { } [ defs-vars* ] reduce members ;
M: def defs-vars* local>> unquote suffix ; M: def defs-vars* local>> unquote suffix ;
@ -28,7 +28,7 @@ M: object defs-vars* drop ;
GENERIC: uses-vars* ( seq form -- seq' ) GENERIC: uses-vars* ( seq form -- seq' )
: uses-vars ( form -- vars ) { } [ uses-vars* ] reduce prune ; : uses-vars ( form -- vars ) { } [ uses-vars* ] reduce members ;
M: local-writer uses-vars* "local-reader" word-prop suffix ; M: local-writer uses-vars* "local-reader" word-prop suffix ;

View File

@ -23,5 +23,5 @@ IN: math.ranges.tests
[ { 0 1/3 2/3 1 } ] [ 1 0 -1/3 <range> >array reverse ] unit-test [ { 0 1/3 2/3 1 } ] [ 1 0 -1/3 <range> >array reverse ] unit-test
[ 100 ] [ [ 100 ] [
1 100 [a,b] [ 2^ [1,b] ] map prune length 1 100 [a,b] [ 2^ [1,b] ] map members length
] unit-test ] unit-test

View File

@ -14,7 +14,7 @@ IN: random.tests
[ t ] [ 10000 [ iota 0 [ drop 187 random + ] reduce ] keep / 2 * 187 10 ~ ] unit-test [ t ] [ 10000 [ iota 0 [ drop 187 random + ] reduce ] keep / 2 * 187 10 ~ ] unit-test
[ t ] [ 10000 [ iota 0 [ drop 400 random + ] reduce ] keep / 2 * 400 10 ~ ] unit-test [ t ] [ 10000 [ iota 0 [ drop 400 random + ] reduce ] keep / 2 * 400 10 ~ ] unit-test
[ t ] [ 1000 [ 400 random ] replicate prune length 256 > ] unit-test [ t ] [ 1000 [ 400 random ] replicate members length 256 > ] unit-test
[ f ] [ 0 random ] unit-test [ f ] [ 0 random ] unit-test
@ -28,8 +28,8 @@ IN: random.tests
[ { 1 2 } 3 sample ] [ too-many-samples? ] must-fail-with [ { 1 2 } 3 sample ] [ too-many-samples? ] must-fail-with
[ 3 ] [ { 1 2 3 4 } 3 sample prune length ] unit-test [ 3 ] [ { 1 2 3 4 } 3 sample members length ] unit-test
[ 99 ] [ 100 iota 99 sample prune length ] unit-test [ 99 ] [ 100 iota 99 sample members length ] unit-test
[ ] [ ]
[ [ 100 random-bytes ] with-system-random drop ] unit-test [ [ 100 random-bytes ] with-system-random drop ] unit-test