From b366a06c4107c3824185a31c988d1eda609ba8ea Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 12 May 2015 18:50:34 -0700 Subject: [PATCH] use reject instead of [ ... not ] filter. --- basis/alien/libraries/finder/linux/linux.factor | 2 +- basis/bootstrap/compiler/compiler.factor | 2 +- basis/bootstrap/help/help.factor | 2 +- basis/byte-arrays/hex/hex.factor | 2 +- basis/classes/struct/struct.factor | 2 +- basis/colors/constants/constants.factor | 2 +- basis/compiler/cfg/hats/hats.factor | 2 +- .../cfg/linear-scan/assignment/assignment.factor | 2 +- basis/compiler/cfg/linear-scan/linear-scan.factor | 2 +- .../linear-scan/live-intervals/live-intervals.factor | 2 +- basis/compiler/cfg/linearization/linearization.factor | 2 +- basis/compiler/cfg/parallel-copy/parallel-copy.factor | 2 +- basis/compiler/cfg/renaming/functor/functor.factor | 6 +++--- basis/compiler/cfg/ssa/destruction/destruction.factor | 2 +- basis/compiler/cfg/stacks/local/local.factor | 2 +- basis/compiler/crossref/crossref-tests.factor | 2 +- basis/compiler/tree/cleanup/cleanup.factor | 2 +- .../tree/propagation/transforms/transforms.factor | 2 +- basis/compiler/tree/recursive/recursive.factor | 2 +- basis/db/types/types.factor | 8 ++++---- basis/game/input/dinput/dinput.factor | 2 +- basis/gobject-introspection/ffi/ffi.factor | 2 +- basis/help/help.factor | 2 +- basis/help/html/html.factor | 2 +- basis/help/lint/checks/checks.factor | 2 +- basis/help/lint/lint.factor | 6 +++--- basis/help/search/search.factor | 2 +- basis/help/vocabs/vocabs.factor | 2 +- basis/html/templates/chloe/chloe-tests.factor | 10 +++++----- basis/inspector/inspector.factor | 2 +- basis/io/directories/directories.factor | 2 +- basis/io/servers/servers.factor | 2 +- basis/io/sockets/icmp/icmp-tests.factor | 2 +- basis/math/matrices/elimination/elimination.factor | 2 +- basis/math/vectors/simd/simd-tests.factor | 2 +- basis/mime/types/types.factor | 2 +- basis/opengl/shaders/shaders.factor | 2 +- basis/peg/ebnf/ebnf.factor | 2 +- basis/porter-stemmer/porter-stemmer-tests.factor | 2 +- basis/prettyprint/sections/sections.factor | 2 +- basis/regexp/classes/classes.factor | 2 +- basis/regexp/dfa/dfa.factor | 2 +- basis/regexp/disambiguate/disambiguate.factor | 2 +- basis/regexp/parser/parser.factor | 2 +- basis/see/see.factor | 2 +- basis/stack-checker/stack-checker-tests.factor | 6 +++--- basis/tools/crossref/crossref.factor | 6 +++--- basis/tools/deploy/shaker/shaker.factor | 2 +- basis/tools/profiler/sampling/sampling.factor | 4 ++-- basis/tools/scaffold/scaffold.factor | 2 +- basis/ui/baseline-alignment/baseline-alignment.factor | 2 +- basis/ui/ui.factor | 2 +- basis/unicode/breaks/breaks-tests.factor | 2 +- basis/unicode/collation/collation.factor | 4 ++-- basis/unicode/data/data.factor | 6 +++--- basis/uuid/uuid.factor | 2 +- basis/vocabs/hierarchy/hierarchy.factor | 8 ++++---- basis/vocabs/metadata/metadata.factor | 4 ++-- basis/vocabs/prettyprint/prettyprint.factor | 4 ++-- basis/vocabs/refresh/refresh.factor | 2 +- basis/windows/messages/messages.factor | 2 +- basis/xml/tests/test.factor | 2 +- basis/xml/writer/writer.factor | 2 +- basis/xmode/keyword-map/keyword-map.factor | 2 +- core/classes/algebra/algebra.factor | 4 ++-- core/hash-sets/hash-sets.factor | 2 +- core/hashtables/hashtables-tests.factor | 2 +- core/io/encodings/utf8/utf8-tests.factor | 2 +- core/parser/parser.factor | 2 +- core/source-files/source-files-tests.factor | 2 +- extra/alien/fortran/fortran.factor | 4 ++-- extra/elf/nm/nm.factor | 2 +- extra/geo-ip/geo-ip.factor | 2 +- extra/gml/parser/parser.factor | 2 +- extra/gpu/render/render.factor | 4 ++-- extra/hashcash/hashcash.factor | 2 +- extra/html/parser/analyzer/analyzer.factor | 2 +- extra/irc/messages/base/base.factor | 2 +- extra/lint/lint.factor | 4 ++-- extra/macho/macho.factor | 2 +- extra/mason/test/test.factor | 2 +- extra/math/extras/extras.factor | 6 +++--- extra/otug-talk/otug-talk.factor | 8 ++++---- extra/project-euler/004/004.factor | 2 +- extra/project-euler/079/079.factor | 2 +- extra/resolv-conf/resolv-conf.factor | 2 +- extra/robots/robots.factor | 2 +- extra/sequences/extras/extras.factor | 2 +- extra/tools/gc-decode/gc-decode-tests.factor | 2 +- extra/youtube/youtube.factor | 4 ++-- unmaintained/adsoda/solution2/solution2.factor | 2 +- unmaintained/alien/inline/inline.factor | 2 +- 92 files changed, 126 insertions(+), 126 deletions(-) diff --git a/basis/alien/libraries/finder/linux/linux.factor b/basis/alien/libraries/finder/linux/linux.factor index 5d2446fbf8..406cb9a41e 100644 --- a/basis/alien/libraries/finder/linux/linux.factor +++ b/basis/alien/libraries/finder/linux/linux.factor @@ -20,7 +20,7 @@ CONSTANT: mach-map { [ " " split1 [ "()" in? ] trim "," split [ [ blank? ] trim ] map - [ "OS ABI:" head? not ] filter + [ "OS ABI:" head? ] reject ] dip 3array ] map ; diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor index e3df913371..d22f0d95c5 100644 --- a/basis/bootstrap/compiler/compiler.factor +++ b/basis/bootstrap/compiler/compiler.factor @@ -32,7 +32,7 @@ gc : compile-unoptimized ( words -- ) [ [ subwords ] map ] keep suffix concat - [ optimized? not ] filter compile ; + [ optimized? ] reject compile ; "debug-compiler" get [ diff --git a/basis/bootstrap/help/help.factor b/basis/bootstrap/help/help.factor index a952d37d7e..85e94d5a1e 100644 --- a/basis/bootstrap/help/help.factor +++ b/basis/bootstrap/help/help.factor @@ -15,7 +15,7 @@ IN: bootstrap.help [ dup lookup-vocab [ drop ] [ no-vocab ] if ] require-hook [ dictionary get values - [ docs-loaded?>> not ] filter + [ docs-loaded?>> ] reject [ load-docs ] each ] with-variable ; diff --git a/basis/byte-arrays/hex/hex.factor b/basis/byte-arrays/hex/hex.factor index 5474f1b745..41444b54e6 100644 --- a/basis/byte-arrays/hex/hex.factor +++ b/basis/byte-arrays/hex/hex.factor @@ -8,7 +8,7 @@ ERROR: odd-length-hex-string string ; SYNTAX: HEX{ "}" parse-tokens concat - [ blank? not ] filter + [ blank? ] reject dup length even? [ odd-length-hex-string ] unless 2 [ hex> ] B{ } map-as suffix! ; diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor index d603e3233a..5ea31bc7d3 100644 --- a/basis/classes/struct/struct.factor +++ b/basis/classes/struct/struct.factor @@ -245,7 +245,7 @@ M: struct-bit-slot-spec compute-slot-offset 1 [ 0 >>offset type>> heap-size max ] reduce ; : struct-alignment ( slots -- align ) - [ struct-bit-slot-spec? not ] filter + [ struct-bit-slot-spec? ] reject 1 [ dup offset>> c-type-align-at max ] reduce ; PRIVATE> diff --git a/basis/colors/constants/constants.factor b/basis/colors/constants/constants.factor index 14d3e0ad1a..ad489a51a2 100644 --- a/basis/colors/constants/constants.factor +++ b/basis/colors/constants/constants.factor @@ -12,7 +12,7 @@ IN: colors.constants [ blank? ] trim-head H{ { CHAR: \s CHAR: - } } substitute swap ; : parse-colors ( lines -- assoc ) - [ "!" head? not ] filter + [ "!" head? ] reject [ 11 cut [ " \t" split harvest ] dip suffix ] map [ parse-color ] H{ } map>assoc ; diff --git a/basis/compiler/cfg/hats/hats.factor b/basis/compiler/cfg/hats/hats.factor index 63786b6d87..fefb4faeea 100644 --- a/basis/compiler/cfg/hats/hats.factor +++ b/basis/compiler/cfg/hats/hats.factor @@ -26,7 +26,7 @@ IN: compiler.cfg.hats : hat-effect ( insn -- effect ) "insn-slots" word-prop - [ type>> { def temp } member-eq? not ] filter [ name>> ] map + [ type>> { def temp } member-eq? ] reject [ name>> ] map { "vreg" } ; : define-hat ( insn -- ) diff --git a/basis/compiler/cfg/linear-scan/assignment/assignment.factor b/basis/compiler/cfg/linear-scan/assignment/assignment.factor index 811e91b9cd..f35e0a5c99 100644 --- a/basis/compiler/cfg/linear-scan/assignment/assignment.factor +++ b/basis/compiler/cfg/linear-scan/assignment/assignment.factor @@ -147,5 +147,5 @@ M: insn assign-registers-in-insn drop ; : assign-registers ( cfg live-intervals -- ) init-assignment - linearization-order [ kill-block?>> not ] filter + linearization-order [ kill-block?>> ] reject [ assign-registers-in-block ] each ; diff --git a/basis/compiler/cfg/linear-scan/linear-scan.factor b/basis/compiler/cfg/linear-scan/linear-scan.factor index d444427a67..b159502cf1 100644 --- a/basis/compiler/cfg/linear-scan/linear-scan.factor +++ b/basis/compiler/cfg/linear-scan/linear-scan.factor @@ -10,7 +10,7 @@ IN: compiler.cfg.linear-scan : admissible-registers ( cfg -- regs ) machine-registers swap frame-pointer?>> [ - [ [ frame-reg = not ] filter ] assoc-map + [ [ frame-reg = ] reject ] assoc-map ] when ; : allocate-and-assign-registers ( cfg -- ) diff --git a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor index 8edbbcf8e0..97211a9152 100644 --- a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor +++ b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor @@ -214,7 +214,7 @@ ERROR: bad-live-interval live-interval ; : compute-live-intervals ( cfg -- live-intervals sync-points ) init-live-intervals - linearization-order [ kill-block?>> not ] filter + linearization-order [ kill-block?>> ] reject [ compute-live-intervals-step ] each live-intervals get finish-live-intervals sync-points get ; diff --git a/basis/compiler/cfg/linearization/linearization.factor b/basis/compiler/cfg/linearization/linearization.factor index 41224cdacd..998bcdfd09 100644 --- a/basis/compiler/cfg/linearization/linearization.factor +++ b/basis/compiler/cfg/linearization/linearization.factor @@ -45,7 +45,7 @@ SYMBOLS: loop-heads visited ; dup visited get ?adjoin [ dup , sorted-successors ] [ drop { } ] if [ predecessors-ready? ] filter [ dup loop-entry? [ find-alternate-loop-head ] when ] map - [ visited? not ] filter ; + [ visited? ] reject ; : (linearization-order) ( cfg -- bbs ) HS{ } clone visited set diff --git a/basis/compiler/cfg/parallel-copy/parallel-copy.factor b/basis/compiler/cfg/parallel-copy/parallel-copy.factor index d09da24d6d..1a7be5d8fd 100644 --- a/basis/compiler/cfg/parallel-copy/parallel-copy.factor +++ b/basis/compiler/cfg/parallel-copy/parallel-copy.factor @@ -14,7 +14,7 @@ SYMBOLS: locs preds to-do ready ; to-do get push-all-back ; : init-ready ( bs -- ) - locs get '[ _ key? not ] filter ready get push-all-front ; + locs get '[ _ key? ] reject ready get push-all-front ; : init ( mapping -- ) to-do set diff --git a/basis/compiler/cfg/renaming/functor/functor.factor b/basis/compiler/cfg/renaming/functor/functor.factor index c3e70af334..2f2d348b72 100644 --- a/basis/compiler/cfg/renaming/functor/functor.factor +++ b/basis/compiler/cfg/renaming/functor/functor.factor @@ -65,19 +65,19 @@ M: ##callback-outputs rename-insn-uses drop ; ! Generate methods for everything else -insn-classes get special-vreg-insns diff [ insn-def-slots empty? not ] filter [ +insn-classes get special-vreg-insns diff [ insn-def-slots empty? ] reject [ [ \ rename-insn-defs create-method-in ] [ insn-def-slots [ name>> ] map DEF-QUOT slot-change-quot ] bi define ] each -insn-classes get special-vreg-insns diff [ insn-use-slots empty? not ] filter [ +insn-classes get special-vreg-insns diff [ insn-use-slots empty? ] reject [ [ \ rename-insn-uses create-method-in ] [ insn-use-slots [ name>> ] map USE-QUOT slot-change-quot ] bi define ] each -insn-classes get [ insn-temp-slots empty? not ] filter [ +insn-classes get [ insn-temp-slots empty? ] reject [ [ \ rename-insn-temps create-method-in ] [ insn-temp-slots [ name>> ] map TEMP-QUOT slot-change-quot ] bi define diff --git a/basis/compiler/cfg/ssa/destruction/destruction.factor b/basis/compiler/cfg/ssa/destruction/destruction.factor index b72a273d89..a67f6a5fa7 100644 --- a/basis/compiler/cfg/ssa/destruction/destruction.factor +++ b/basis/compiler/cfg/ssa/destruction/destruction.factor @@ -115,7 +115,7 @@ M: ##copy cleanup-insn dup useful-copy? [ , ] [ drop ] if ; M: ##parallel-copy cleanup-insn - values>> [ leaders ] assoc-map [ first2 = not ] filter + values>> [ leaders ] assoc-map [ first2 = ] reject parallel-copy-rep % ; M: ##tagged>integer cleanup-insn diff --git a/basis/compiler/cfg/stacks/local/local.factor b/basis/compiler/cfg/stacks/local/local.factor index b1dfdaaef6..f26bf76654 100644 --- a/basis/compiler/cfg/stacks/local/local.factor +++ b/basis/compiler/cfg/stacks/local/local.factor @@ -24,7 +24,7 @@ IN: compiler.cfg.stacks.local : height-state>insns ( state -- insns ) [ second ] map { ds-loc rs-loc } [ new swap >>n ] 2map - [ n>> 0 = not ] filter [ ##inc new swap >>loc ] map ; + [ n>> 0 = ] reject [ ##inc new swap >>loc ] map ; : translate-local-loc ( loc state -- loc' ) [ clone ] dip over >loc< 0 1 ? rot nth first - >>n ; diff --git a/basis/compiler/crossref/crossref-tests.factor b/basis/compiler/crossref/crossref-tests.factor index 9cd475b2de..38798de8da 100644 --- a/basis/compiler/crossref/crossref-tests.factor +++ b/basis/compiler/crossref/crossref-tests.factor @@ -5,5 +5,5 @@ IN: compiler.crossref.tests ! in the middle of recompiling something [ { } ] [ all-words dup [ subwords ] map concat append - H{ } clone '[ _ dependencies-satisfied? not ] filter + H{ } clone '[ _ dependencies-satisfied? ] reject ] unit-test diff --git a/basis/compiler/tree/cleanup/cleanup.factor b/basis/compiler/tree/cleanup/cleanup.factor index e6d3a5149c..d610ef1765 100644 --- a/basis/compiler/tree/cleanup/cleanup.factor +++ b/basis/compiler/tree/cleanup/cleanup.factor @@ -12,7 +12,7 @@ IN: compiler.tree.cleanup GENERIC: delete-node ( node -- ) M: #call-recursive delete-node - dup label>> calls>> [ node>> eq? not ] with filter! drop ; + dup label>> calls>> [ node>> eq? ] with reject! drop ; M: #return-recursive delete-node label>> f >>return drop ; diff --git a/basis/compiler/tree/propagation/transforms/transforms.factor b/basis/compiler/tree/propagation/transforms/transforms.factor index fcbb2b272b..a756fa5701 100644 --- a/basis/compiler/tree/propagation/transforms/transforms.factor +++ b/basis/compiler/tree/propagation/transforms/transforms.factor @@ -301,7 +301,7 @@ CONSTANT: lookup-table-at-max 256 \ at* [ at-quot ] 1 define-partial-eval : diff-quot ( seq -- quot: ( seq' -- seq'' ) ) - [ tester ] keep '[ members [ @ not ] filter _ set-like ] ; + [ tester ] keep '[ members [ @ ] reject _ set-like ] ; M\ set diff [ diff-quot ] 1 define-partial-eval diff --git a/basis/compiler/tree/recursive/recursive.factor b/basis/compiler/tree/recursive/recursive.factor index 4517a48fdc..2c65a700b6 100644 --- a/basis/compiler/tree/recursive/recursive.factor +++ b/basis/compiler/tree/recursive/recursive.factor @@ -73,7 +73,7 @@ SYMBOLS: not-loops recursive-nesting ; : not-a-loop? ( label -- ? ) not-loops get in? ; : non-tail-calls ( call-graph-node -- seq ) - calls>> [ tail?>> not ] filter ; + calls>> [ tail?>> ] reject ; : visit-back-edges ( call-graph -- ) [ diff --git a/basis/db/types/types.factor b/basis/db/types/types.factor index 222ac2a9f5..aedbaf9f72 100644 --- a/basis/db/types/types.factor +++ b/basis/db/types/types.factor @@ -33,7 +33,7 @@ SYMBOL: IGNORE : filter-ignores ( tuple specs -- specs' ) [ [ nip IGNORE = ] assoc-filter keys ] dip - [ slot-name>> swap member? not ] with filter ; + [ slot-name>> swap member? ] with reject ; ERROR: not-persistent class ; @@ -99,13 +99,13 @@ FACTOR-BLOB NULL URL ; dup number? [ number>string ] when ; : remove-db-assigned-id ( specs -- obj ) - [ +db-assigned-id+? not ] filter ; + [ +db-assigned-id+? ] reject ; : remove-relations ( specs -- newcolumns ) - [ relation? not ] filter ; + [ relation? ] reject ; : remove-id ( specs -- obj ) - [ primary-key>> not ] filter ; + [ primary-key>> ] reject ; ! SQLite Types: http://www.sqlite.org/datatype3.html ! NULL INTEGER REAL TEXT BLOB diff --git a/basis/game/input/dinput/dinput.factor b/basis/game/input/dinput/dinput.factor index ff8e47577b..92bd6a73f5 100755 --- a/basis/game/input/dinput/dinput.factor +++ b/basis/game/input/dinput/dinput.factor @@ -159,7 +159,7 @@ SYMBOLS: +dinput+ +keyboard-device+ +keyboard-state+ : find-and-remove-detached-devices ( -- ) +controller-devices+ get-global keys - [ device-attached? not ] filter + [ device-attached? ] reject [ remove-controller ] each ; : ?device-interface ( dbt-broadcast-hdr -- ? ) diff --git a/basis/gobject-introspection/ffi/ffi.factor b/basis/gobject-introspection/ffi/ffi.factor index badd24e19f..0735b58241 100644 --- a/basis/gobject-introspection/ffi/ffi.factor +++ b/basis/gobject-introspection/ffi/ffi.factor @@ -323,7 +323,7 @@ M: array-type field-type>c-type type>c-type ; : def-classes ( classes -- ) [ def-class ] each ; : def-boxeds ( boxeds -- ) - [ find-existing-boxed-type not ] filter + [ find-existing-boxed-type ] reject [ def-boxed-type ] each ; : def-records ( records -- ) diff --git a/basis/help/help.factor b/basis/help/help.factor index afbcc7c849..77304db86b 100644 --- a/basis/help/help.factor +++ b/basis/help/help.factor @@ -33,7 +33,7 @@ M: predicate word-help* drop \ $predicate ; : orphan-articles ( -- seq ) articles get keys - [ article-parent not ] filter ; + [ article-parent ] reject ; : xref-help ( -- ) all-articles [ xref-article ] each ; diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor index 7930f165b6..5b9a646ee5 100644 --- a/basis/help/html/html.factor +++ b/basis/help/html/html.factor @@ -99,7 +99,7 @@ M: pathname url-of : all-vocabs-really ( -- seq ) all-vocabs-recursive no-roots remove-redundant-prefixes - [ vocab-name "scratchpad" = not ] filter ; + [ vocab-name "scratchpad" = ] reject ; : all-topics ( -- topics ) [ diff --git a/basis/help/lint/checks/checks.factor b/basis/help/lint/checks/checks.factor index 47bf7c3dd2..d5f5cce259 100644 --- a/basis/help/lint/checks/checks.factor +++ b/basis/help/lint/checks/checks.factor @@ -157,7 +157,7 @@ SYMBOL: vocab-articles dup struct-class? [ struct-slots ] [ all-slots ] if [ name>> ] map ] [ extract-slots ] bi* - [ swap member? not ] with filter [ + [ swap member? ] with reject [ ", " join "Described $slot does not exist: " prepend simple-lint-error ] unless-empty diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor index 890445f442..25115905b4 100644 --- a/basis/help/lint/lint.factor +++ b/basis/help/lint/lint.factor @@ -93,10 +93,10 @@ PRIVATE> : :lint-failures ( -- ) lint-failures get values errors. ; : unlinked-words ( vocab -- seq ) - words all-word-help [ article-parent not ] filter ; + words all-word-help [ article-parent ] reject ; : linked-undocumented-words ( -- seq ) all-words - [ word-help not ] filter + [ word-help ] reject [ article-parent ] filter - [ predicate? not ] filter ; + [ predicate? ] reject ; diff --git a/basis/help/search/search.factor b/basis/help/search/search.factor index 0a127b177e..9d6ff60107 100644 --- a/basis/help/search/search.factor +++ b/basis/help/search/search.factor @@ -31,7 +31,7 @@ IN: help.search MEMO: article-words ( name -- words ) article-content [ element-value ] map " " join search-words - [ [ digit? ] all? not ] filter + [ [ digit? ] all? ] reject [ [ { [ letter? ] [ digit? ] } 1|| not ] trim ] map! harvest ; : (search-articles) ( string -- seq' ) diff --git a/basis/help/vocabs/vocabs.factor b/basis/help/vocabs/vocabs.factor index 5827a3749a..3f7c2d0184 100644 --- a/basis/help/vocabs/vocabs.factor +++ b/basis/help/vocabs/vocabs.factor @@ -200,7 +200,7 @@ C: vocab-author natural-sort [ [ class? ] filter describe-classes ] [ - [ [ class? ] [ symbol? ] bi and not ] filter + [ [ class? ] [ symbol? ] bi and ] reject [ parsing-word? ] partition [ generic? ] partition [ macro? ] partition diff --git a/basis/html/templates/chloe/chloe-tests.factor b/basis/html/templates/chloe/chloe-tests.factor index 780b55462c..b27d706bca 100644 --- a/basis/html/templates/chloe/chloe-tests.factor +++ b/basis/html/templates/chloe/chloe-tests.factor @@ -9,7 +9,7 @@ IN: html.templates.chloe.tests [ ] [ reset-cache ] unit-test : run-template ( quot -- string ) - with-string-writer [ "\r\n\t" member? not ] filter + with-string-writer [ "\r\n\t" member? ] reject "?>" split1 nip ; inline : test-template ( name -- template ) @@ -97,7 +97,7 @@ M: link-test link-href drop "http://www.apple.com/foo&bar" ; [ "
  • 1
  • 2
  • 3
" ] [ [ "test7" test-template call-template - ] run-template [ blank? not ] filter + ] run-template [ blank? ] reject ] unit-test TUPLE: person first-name last-name ; @@ -112,7 +112,7 @@ TUPLE: person first-name last-name ; [ "
RBaxterUnknown
DougColeman
" ] [ [ "test8" test-template call-template - ] run-template [ blank? not ] filter + ] run-template [ blank? ] reject ] unit-test [ ] [ @@ -125,7 +125,7 @@ TUPLE: person first-name last-name ; [ "
RBaxterUnknown
DougColeman
" ] [ [ "test8" test-template call-template - ] run-template [ blank? not ] filter + ] run-template [ blank? ] reject ] unit-test [ ] [ 1 "id" set-value ] unit-test @@ -153,7 +153,7 @@ TUPLE: person first-name last-name ; [ "
RBaxterUnknown
" ] [ [ "test11" test-template call-template - ] run-template [ blank? not ] filter + ] run-template [ blank? ] reject ] unit-test [ ] [ diff --git a/basis/inspector/inspector.factor b/basis/inspector/inspector.factor index 22c4399180..97c28f7dfe 100644 --- a/basis/inspector/inspector.factor +++ b/basis/inspector/inspector.factor @@ -53,7 +53,7 @@ PRIVATE> M: tuple error. describe ; : vars-in-scope ( seq -- alist ) - [ [ global eq? not ] filter [ keys ] gather ] keep + [ [ global eq? ] reject [ keys ] gather ] keep '[ dup _ assoc-stack ] H{ } map>assoc ; : .vars ( -- ) diff --git a/basis/io/directories/directories.factor b/basis/io/directories/directories.factor index 86c2778cd7..eee03c7852 100644 --- a/basis/io/directories/directories.factor +++ b/basis/io/directories/directories.factor @@ -38,7 +38,7 @@ HOOK: (directory-entries) os ( path -- seq ) : directory-entries ( path -- seq ) normalize-path (directory-entries) - [ name>> { "." ".." } member? not ] filter ; + [ name>> { "." ".." } member? ] reject ; : directory-files ( path -- seq ) directory-entries [ name>> ] map! ; diff --git a/basis/io/servers/servers.factor b/basis/io/servers/servers.factor index 5eee753db2..8f7ce10c85 100755 --- a/basis/io/servers/servers.factor +++ b/basis/io/servers/servers.factor @@ -243,7 +243,7 @@ PRIVATE> server-addrs [ secure? ] filter random ; : insecure-addr ( -- addrspec ) - server-addrs [ secure? not ] filter random ; + server-addrs [ secure? ] reject random ; : server. ( threaded-server -- ) [ [ "=== " write name>> ] [ ] bi write-object nl ] diff --git a/basis/io/sockets/icmp/icmp-tests.factor b/basis/io/sockets/icmp/icmp-tests.factor index 602ecc5060..221c489452 100644 --- a/basis/io/sockets/icmp/icmp-tests.factor +++ b/basis/io/sockets/icmp/icmp-tests.factor @@ -6,5 +6,5 @@ IN: io.sockets.icmp.tests [ { } ] [ "localhost" resolve-host - [ [ icmp4? ] [ icmp6? ] bi or not ] filter + [ [ icmp4? ] [ icmp6? ] bi or ] reject ] unit-test diff --git a/basis/math/matrices/elimination/elimination.factor b/basis/math/matrices/elimination/elimination.factor index c3beb6b0dd..168274a12e 100644 --- a/basis/math/matrices/elimination/elimination.factor +++ b/basis/math/matrices/elimination/elimination.factor @@ -70,7 +70,7 @@ SYMBOL: matrix [ 0 0 (echelon) ] with-matrix ; : nonzero-rows ( matrix -- matrix' ) - [ [ zero? ] all? not ] filter ; + [ [ zero? ] all? ] reject ; : null/rank ( matrix -- null rank ) echelon dup length swap nonzero-rows length [ - ] keep ; diff --git a/basis/math/vectors/simd/simd-tests.factor b/basis/math/vectors/simd/simd-tests.factor index 015792a20c..e73bc9c28f 100644 --- a/basis/math/vectors/simd/simd-tests.factor +++ b/basis/math/vectors/simd/simd-tests.factor @@ -183,7 +183,7 @@ TUPLE: simd-test-failure ] unit-test [ { } ] [ - simd-classes [ '[ _ new ] compile-call [ zero? ] all? not ] filter + simd-classes [ '[ _ new ] compile-call [ zero? ] all? ] reject ] unit-test "== Checking -with constructors" print diff --git a/basis/mime/types/types.factor b/basis/mime/types/types.factor index 81518d5319..94398fbc0e 100644 --- a/basis/mime/types/types.factor +++ b/basis/mime/types/types.factor @@ -7,7 +7,7 @@ IN: mime.types MEMO: mime-db ( -- seq ) "vocab:mime/types/mime.types" ascii file-lines - [ "#" head? not ] filter [ " \t" split harvest ] map harvest ; + [ "#" head? ] reject [ " \t" split harvest ] map harvest ; : nonstandard-mime-types ( -- assoc ) H{ diff --git a/basis/opengl/shaders/shaders.factor b/basis/opengl/shaders/shaders.factor index f2f527994b..fd2deb4ff1 100644 --- a/basis/opengl/shaders/shaders.factor +++ b/basis/opengl/shaders/shaders.factor @@ -109,7 +109,7 @@ PREDICATE: fragment-shader < gl-shader (fragment-shader?) ; dup gl-program-shaders-length 2 * 0 int over uint - [ glGetAttachedShaders ] keep [ zero? not ] filter ; + [ glGetAttachedShaders ] keep [ zero? ] reject ; : delete-gl-program-only ( program -- ) glDeleteProgram ; inline diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor index 6d8233a588..ca3d9ee915 100644 --- a/basis/peg/ebnf/ebnf.factor +++ b/basis/peg/ebnf/ebnf.factor @@ -97,7 +97,7 @@ C: ebnf : filter-hidden ( seq -- seq ) #! Remove elements that produce no AST from sequence - [ ebnf-ensure-not? not ] filter [ ebnf-ensure? not ] filter ; + [ ebnf-ensure-not? ] reject [ ebnf-ensure? not ] filter ; : syntax ( string -- parser ) #! Parses the string, ignoring white space, and diff --git a/basis/porter-stemmer/porter-stemmer-tests.factor b/basis/porter-stemmer/porter-stemmer-tests.factor index 4403541608..cf69e4466d 100644 --- a/basis/porter-stemmer/porter-stemmer-tests.factor +++ b/basis/porter-stemmer/porter-stemmer-tests.factor @@ -60,5 +60,5 @@ io.files io.encodings.utf8 ; "vocab:porter-stemmer/test/voc.txt" utf8 file-lines [ stem ] map "vocab:porter-stemmer/test/output.txt" utf8 file-lines - [ 2array ] 2map [ first2 = not ] filter + [ 2array ] 2map [ first2 = ] reject ] unit-test diff --git a/basis/prettyprint/sections/sections.factor b/basis/prettyprint/sections/sections.factor index 8cd172bffe..2e308f963a 100644 --- a/basis/prettyprint/sections/sections.factor +++ b/basis/prettyprint/sections/sections.factor @@ -191,7 +191,7 @@ M: block section-fits? ( section -- ? ) : pprint-sections ( block advancer -- ) [ - sections>> [ line-break? not ] filter + sections>> [ line-break? ] reject unclip-slice pprint-section ] dip [ [ pprint-section ] bi ] curry each ; inline diff --git a/basis/regexp/classes/classes.factor b/basis/regexp/classes/classes.factor index 58f08ef793..7ad452a0b0 100644 --- a/basis/regexp/classes/classes.factor +++ b/basis/regexp/classes/classes.factor @@ -217,7 +217,7 @@ TUPLE: class-partition integers not-integers simples not-simples and or other ; dup [ simples>> ] [ not-simples>> ] [ and>> ] tri 3append or-class boa - '[ [ _ class-member? not ] filter ] change-integers ; + '[ [ _ class-member? ] reject ] change-integers ; : answer-ands ( partition -- partition' ) dup [ integers>> ] [ not-simples>> ] [ simples>> ] tri 3append diff --git a/basis/regexp/dfa/dfa.factor b/basis/regexp/dfa/dfa.factor index e25c0f13b4..5c77741032 100644 --- a/basis/regexp/dfa/dfa.factor +++ b/basis/regexp/dfa/dfa.factor @@ -40,7 +40,7 @@ IN: regexp.dfa : find-transitions ( dfa-state nfa -- next-dfa-state ) transitions>> '[ _ at keys [ condition-states ] map concat ] gather - [ tagged-epsilon? not ] filter ; + [ tagged-epsilon? ] reject ; : add-todo-state ( state visited-states new-states -- ) 2over ?adjoin [ nip push ] [ 3drop ] if ; diff --git a/basis/regexp/disambiguate/disambiguate.factor b/basis/regexp/disambiguate/disambiguate.factor index 33b2ded448..256770c4e5 100644 --- a/basis/regexp/disambiguate/disambiguate.factor +++ b/basis/regexp/disambiguate/disambiguate.factor @@ -51,7 +51,7 @@ TUPLE: parts in out ; : new-transitions ( transitions -- assoc ) ! assoc is class, partition values [ keys ] gather - [ tagged-epsilon? not ] filter + [ tagged-epsilon? ] reject class-partitions ; : get-transitions ( partition state-transitions -- next-states ) diff --git a/basis/regexp/parser/parser.factor b/basis/regexp/parser/parser.factor index d9ab28ebe1..5aeb9aa708 100644 --- a/basis/regexp/parser/parser.factor +++ b/basis/regexp/parser/parser.factor @@ -22,7 +22,7 @@ ERROR: bad-class name ; : simple ( str -- simple ) ! Alternatively, first collation key level? - >case-fold [ " \t_" member? not ] filter ; + >case-fold [ " \t_" member? ] reject ; : simple-table ( seq -- table ) [ [ simple ] keep ] H{ } map>assoc ; diff --git a/basis/see/see.factor b/basis/see/see.factor index 0316acf378..b43b53de23 100644 --- a/basis/see/see.factor +++ b/basis/see/see.factor @@ -241,7 +241,7 @@ M: word see* : seeing-implementors ( class -- seq ) dup implementors - [ [ reader? ] [ writer? ] bi or not ] filter + [ [ reader? ] [ writer? ] bi or ] reject [ lookup-method ] with map natural-sort ; diff --git a/basis/stack-checker/stack-checker-tests.factor b/basis/stack-checker/stack-checker-tests.factor index 60adcd2728..8e9f97e457 100644 --- a/basis/stack-checker/stack-checker-tests.factor +++ b/basis/stack-checker/stack-checker-tests.factor @@ -409,9 +409,9 @@ DEFER: eee' ! Make sure all primitives are covered [ { } ] [ all-words [ primitive? ] filter - [ "default-output-classes" word-prop not ] filter - [ "special" word-prop not ] filter - [ "shuffle" word-prop not ] filter + [ "default-output-classes" word-prop ] reject + [ "special" word-prop ] reject + [ "shuffle" word-prop ] reject ] unit-test { 1 0 } [ [ drop ] each ] must-infer-as diff --git a/basis/tools/crossref/crossref.factor b/basis/tools/crossref/crossref.factor index 33cdeed258..04aae88ae8 100644 --- a/basis/tools/crossref/crossref.factor +++ b/basis/tools/crossref/crossref.factor @@ -62,7 +62,7 @@ M: object uses drop f ; : defs-to-crossref ( -- seq ) [ all-words - [ [ generic? not ] filter ] + [ [ generic? ] reject ] [ [ subwords ] map concat ] bi all-articles [ >link ] map @@ -95,7 +95,7 @@ PRIVATE> GENERIC: smart-usage ( defspec -- seq ) -M: object smart-usage usage [ irrelevant? not ] filter ; +M: object smart-usage usage [ irrelevant? ] reject ; M: method smart-usage "method-generic" word-prop smart-usage ; @@ -115,7 +115,7 @@ M: f smart-usage drop \ f smart-usage ; [ "No usages." print ] [ sorted-definitions. ] if-empty ; : vocab-xref ( vocab quot: ( defspec -- seq ) -- vocabs ) - [ [ vocab-name ] [ words [ generic? not ] filter ] bi ] dip map + [ [ vocab-name ] [ words [ generic? ] reject ] bi ] dip map [ [ [ word? ] [ generic? not ] bi and ] filter [ dup method? diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor index 4610e2b547..7cd7465582 100755 --- a/basis/tools/deploy/shaker/shaker.factor +++ b/basis/tools/deploy/shaker/shaker.factor @@ -125,7 +125,7 @@ IN: tools.deploy.shaker : strip-word-defs ( words -- ) "Stripping symbolic word definitions" show - [ "no-def-strip" word-prop not ] filter + [ "no-def-strip" word-prop ] reject [ [ ] >>def drop ] each ; : strip-word-props ( stripped-props words -- ) diff --git a/basis/tools/profiler/sampling/sampling.factor b/basis/tools/profiler/sampling/sampling.factor index d90efdaafe..c874aeb6bf 100644 --- a/basis/tools/profiler/sampling/sampling.factor +++ b/basis/tools/profiler/sampling/sampling.factor @@ -95,7 +95,7 @@ CONSTANT: zero-counts { 0 0 0 0 0 } :: (collect-subtrees) ( samples max-depth depth child-quot: ( samples -- child ) -- children ) max-depth depth > [ - samples [ sample-callstack leaf-callstack? not ] filter + samples [ sample-callstack leaf-callstack? ] reject [ f ] [ child-quot call ] if-empty ] [ f ] if ; inline @@ -144,7 +144,7 @@ PRIVATE> :: collect-flat ( samples -- flat ) IH{ } clone :> per-word-samples samples [| sample | - sample sample-callstack members [ ignore-word? not ] filter [ + sample sample-callstack members [ ignore-word? ] reject [ per-word-samples sample counts+at ] each ] each diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor index 8f1aeed56a..7cf5b14717 100644 --- a/basis/tools/scaffold/scaffold.factor +++ b/basis/tools/scaffold/scaffold.factor @@ -216,7 +216,7 @@ M: object add-using ( object -- ) : interesting-words ( vocab -- array ) words - [ { [ "help" word-prop ] [ predicate? ] } 1|| not ] filter + [ { [ "help" word-prop ] [ predicate? ] } 1|| ] reject natural-sort ; : interesting-words. ( vocab -- ) diff --git a/basis/ui/baseline-alignment/baseline-alignment.factor b/basis/ui/baseline-alignment/baseline-alignment.factor index 3678f9bbd1..2527b52295 100644 --- a/basis/ui/baseline-alignment/baseline-alignment.factor +++ b/basis/ui/baseline-alignment/baseline-alignment.factor @@ -57,7 +57,7 @@ TUPLE: gadget-metrics height ascent descent cap-height ; [ descent>> ] map ?supremum ; : max-graphics-height ( seq -- y ) - [ ascent>> not ] filter [ height>> ] map ?supremum 0 or ; + [ ascent>> ] reject [ height>> ] map ?supremum 0 or ; :: combine-metrics ( graphics-height ascent descent cap-height -- ascent' descent' ) ascent [ diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor index 5eafa48c87..e1c8882cdd 100644 --- a/basis/ui/ui.factor +++ b/basis/ui/ui.factor @@ -29,7 +29,7 @@ SYMBOL: windows [ [ length 1 - dup 1 - ] keep exchange ] [ drop ] if ; : unregister-window ( handle -- ) - windows [ [ first = not ] with filter ] change-global ; + windows [ [ first = ] with reject ] change-global ; : raised-window ( world -- ) windows get-global diff --git a/basis/unicode/breaks/breaks-tests.factor b/basis/unicode/breaks/breaks-tests.factor index 0311b43474..a3acaf3c4f 100644 --- a/basis/unicode/breaks/breaks-tests.factor +++ b/basis/unicode/breaks/breaks-tests.factor @@ -30,7 +30,7 @@ IN: unicode.breaks.tests [ "×" split [ [ blank? ] trim hex> ] map - [ { f 0 } member? not ] filter + [ { f 0 } member? ] reject >string ] map harvest diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor index b907d33eba..65d3887fc9 100644 --- a/basis/unicode/collation/collation.factor +++ b/basis/unicode/collation/collation.factor @@ -97,8 +97,8 @@ ducet get-global insert-helpers ] { } map-as concat ; : append-weights ( weights quot -- ) - [ [ ignorable?>> not ] filter ] dip - map [ zero? not ] filter % 0 , ; inline + [ [ ignorable?>> ] reject ] dip + map [ zero? ] reject % 0 , ; inline : variable-weight ( weight -- ) dup ignorable?>> [ primary>> ] [ drop 0xFFFF ] if , ; diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor index e0fb579fb8..1f7336495c 100644 --- a/basis/unicode/data/data.factor +++ b/basis/unicode/data/data.factor @@ -114,7 +114,7 @@ PRIVATE> : exclusions ( -- set ) exclusions-file utf8 file-lines [ "#" split1 drop [ blank? ] trim-tail hex> ] map - [ 0 = not ] filter ; + [ 0 = ] reject ; : remove-exclusions ( alist -- alist ) exclusions unique assoc-diff ; @@ -129,7 +129,7 @@ PRIVATE> : process-compatibility ( data -- hash ) (process-decomposed) [ dup first* [ first2 rest 2array ] unless ] map - [ second empty? not ] filter + [ second empty? ] reject >hashtable chain-decomposed ; : process-combining ( data -- hash ) @@ -209,7 +209,7 @@ load-data { } cleave combine-map keys [ 2ch> nip ] map -[ combining-class not ] filter +[ combining-class ] reject [ 0 swap class-map set-at ] each load-special-casing special-casing swap assoc-union! drop diff --git a/basis/uuid/uuid.factor b/basis/uuid/uuid.factor index 32d3cb5d79..35338bfd22 100644 --- a/basis/uuid/uuid.factor +++ b/basis/uuid/uuid.factor @@ -48,7 +48,7 @@ IN: uuid [ CHAR: - 8 ] dip insert-nth ; : string>uuid ( string -- n ) - [ CHAR: - = not ] filter hex> ; + [ CHAR: - = ] reject hex> ; PRIVATE> diff --git a/basis/vocabs/hierarchy/hierarchy.factor b/basis/vocabs/hierarchy/hierarchy.factor index 7a20bcfa1b..07c2097e35 100644 --- a/basis/vocabs/hierarchy/hierarchy.factor +++ b/basis/vocabs/hierarchy/hierarchy.factor @@ -55,7 +55,7 @@ ERROR: vocab-root-required root ; [ ensure-vocab-root ] dip [ ((child-vocabs-recursive)) ] { } make ; -: no-rooted ( seq -- seq' ) [ find-vocab-root not ] filter ; +: no-rooted ( seq -- seq' ) [ find-vocab-root ] reject ; : one-level-only? ( name prefix -- ? ) ?head [ "." split1 nip not ] [ drop f ] if ; @@ -70,7 +70,7 @@ ERROR: vocab-root-required root ; PRIVATE> -: no-prefixes ( seq -- seq' ) [ vocab-prefix? not ] filter ; +: no-prefixes ( seq -- seq' ) [ vocab-prefix? ] reject ; : convert-prefixes ( seq -- seq' ) [ dup vocab-prefix? [ name>> ] when ] map ; @@ -80,7 +80,7 @@ PRIVATE> [ vocab-prefix? ] partition [ [ vocab-name ] map fast-set - '[ name>> _ in? not ] filter + '[ name>> _ in? ] reject convert-prefixes ] keep append ; @@ -136,7 +136,7 @@ PRIVATE> : (load-from-root) ( root prefix -- failures ) vocabs-in-root/prefix - [ don't-load? not ] filter no-prefixes + [ don't-load? ] reject no-prefixes require-all ; : load-from-root ( root prefix -- ) diff --git a/basis/vocabs/metadata/metadata.factor b/basis/vocabs/metadata/metadata.factor index 83621349ea..a89c581ea4 100644 --- a/basis/vocabs/metadata/metadata.factor +++ b/basis/vocabs/metadata/metadata.factor @@ -108,13 +108,13 @@ ERROR: bad-platform name ; } 1|| ; : filter-don't-load ( vocabs -- vocabs' ) - [ vocab-name don't-load? not ] filter ; + [ vocab-name don't-load? ] reject ; : don't-test? ( vocab -- ? ) vocab-tags "not tested" swap member? ; : filter-don't-test ( vocabs -- vocabs' ) - [ don't-test? not ] filter ; + [ don't-test? ] reject ; TUPLE: unsupported-platform vocab requires ; diff --git a/basis/vocabs/prettyprint/prettyprint.factor b/basis/vocabs/prettyprint/prettyprint.factor index bca011227f..07fecef4a2 100644 --- a/basis/vocabs/prettyprint/prettyprint.factor +++ b/basis/vocabs/prettyprint/prettyprint.factor @@ -19,7 +19,7 @@ IN: vocabs.prettyprint [ vocab-name ] sort-with ; : pprint-using ( seq -- ) - [ "syntax" lookup-vocab = not ] filter + [ "syntax" lookup-vocab = ] reject sort-vocabs [ \ USING: pprint-word [ pprint-vocab ] each @@ -65,7 +65,7 @@ M: rename pprint-qualified ( rename -- ) ] with-pprint ; : filter-interesting ( seq -- seq' ) - [ [ vocab? ] [ extra-words? ] bi or not ] filter ; + [ [ vocab? ] [ extra-words? ] bi or ] reject ; PRIVATE> diff --git a/basis/vocabs/refresh/refresh.factor b/basis/vocabs/refresh/refresh.factor index c110959430..02e3779cd4 100644 --- a/basis/vocabs/refresh/refresh.factor +++ b/basis/vocabs/refresh/refresh.factor @@ -54,7 +54,7 @@ SYMBOL: modified-docs V{ } clone modified-sources set V{ } clone modified-docs set - child-vocabs [ ".private" tail? not ] filter [ + child-vocabs [ ".private" tail? ] reject [ [ [ [ modified-sources ] diff --git a/basis/windows/messages/messages.factor b/basis/windows/messages/messages.factor index b9c8fe9fd8..1b8faa3221 100644 --- a/basis/windows/messages/messages.factor +++ b/basis/windows/messages/messages.factor @@ -7,7 +7,7 @@ IN: windows.messages SYMBOL: windows-messages "windows.messages" words -[ name>> "windows-message" head? not ] filter +[ name>> "windows-message" head? ] reject [ dup execute swap ] { } map>assoc windows-messages set-global diff --git a/basis/xml/tests/test.factor b/basis/xml/tests/test.factor index e371c3aab5..dba51d57ab 100644 --- a/basis/xml/tests/test.factor +++ b/basis/xml/tests/test.factor @@ -57,7 +57,7 @@ SYMBOL: xml-file [ ] [ "" string>xml drop ] unit-test : first-thing ( seq -- elt ) - [ "" = not ] filter first ; + [ "" = ] reject first ; [ T{ element-decl f "br" "EMPTY" } ] [ "" string>dtd directives>> first-thing ] unit-test [ T{ element-decl f "p" "(#PCDATA|emph)*" } ] [ "" string>dtd directives>> first-thing ] unit-test diff --git a/basis/xml/writer/writer.factor b/basis/xml/writer/writer.factor index 40bb5c54ec..0243edec6f 100644 --- a/basis/xml/writer/writer.factor +++ b/basis/xml/writer/writer.factor @@ -34,7 +34,7 @@ SYMBOL: indentation : ?filter-children ( children -- no-whitespace ) xml-pprint? get [ [ dup string? [ [ blank? ] trim ] when ] map - [ "" = not ] filter + [ "" = ] reject ] when ; PRIVATE> diff --git a/basis/xmode/keyword-map/keyword-map.factor b/basis/xmode/keyword-map/keyword-map.factor index 402dd974b1..663e6c7f36 100644 --- a/basis/xmode/keyword-map/keyword-map.factor +++ b/basis/xmode/keyword-map/keyword-map.factor @@ -32,7 +32,7 @@ M: keyword-map >alist assoc>> >alist ; : (keyword-map-no-word-sep) ( assoc -- str ) - keys combine [ alpha? not ] filter natural-sort ; + keys combine [ alpha? ] reject natural-sort ; : keyword-map-no-word-sep* ( keyword-map -- str ) dup no-word-sep>> [ ] [ diff --git a/core/classes/algebra/algebra.factor b/core/classes/algebra/algebra.factor index 074cf1b9e3..322320e837 100644 --- a/core/classes/algebra/algebra.factor +++ b/core/classes/algebra/algebra.factor @@ -19,7 +19,7 @@ ERROR: not-classoids sequence ; : check-classoids ( members -- members ) dup [ classoid? ] all? - [ [ classoid? not ] filter not-classoids ] unless ; + [ [ classoid? ] reject not-classoids ] unless ; ERROR: not-a-classoid object ; @@ -28,7 +28,7 @@ ERROR: not-a-classoid object ; : ( members -- classoid ) check-classoids - [ null eq? not ] filter set-members + [ null eq? ] reject set-members dup length 1 = [ first ] [ sort-classes f like anonymous-union boa ] if ; M: anonymous-union rank-class drop 6 ; diff --git a/core/hash-sets/hash-sets.factor b/core/hash-sets/hash-sets.factor index 3f98d7fdd7..6f2ed9eb50 100644 --- a/core/hash-sets/hash-sets.factor +++ b/core/hash-sets/hash-sets.factor @@ -200,7 +200,7 @@ M: f fast-set drop 0 ; M: sequence fast-set >hash-set ; M: sequence duplicates - dup length [ ?adjoin not ] curry filter ; + dup length [ ?adjoin ] curry reject ; M: sequence all-unique? dup length [ ?adjoin ] curry all? ; diff --git a/core/hashtables/hashtables-tests.factor b/core/hashtables/hashtables-tests.factor index f9d5f7c174..5a6ba05e9e 100644 --- a/core/hashtables/hashtables-tests.factor +++ b/core/hashtables/hashtables-tests.factor @@ -8,7 +8,7 @@ IN: hashtables.tests [ ] [ 1000 iota [ dup sq ] H{ } map>assoc "testhash" set ] unit-test [ V{ } ] -[ 1000 iota [ dup sq swap "testhash" get at = not ] filter ] +[ 1000 iota [ dup sq swap "testhash" get at = ] reject ] unit-test [ t ] diff --git a/core/io/encodings/utf8/utf8-tests.factor b/core/io/encodings/utf8/utf8-tests.factor index f3e444e777..1063396fdd 100644 --- a/core/io/encodings/utf8/utf8-tests.factor +++ b/core/io/encodings/utf8/utf8-tests.factor @@ -26,7 +26,7 @@ IN: io.encodings.utf8.tests [ 3 ] [ 2 "lápis" >utf8-index ] unit-test -[ V{ } ] [ 100000 iota [ [ code-point-length ] [ 1string utf8 encode length ] bi = not ] filter ] unit-test +[ V{ } ] [ 100000 iota [ [ code-point-length ] [ 1string utf8 encode length ] bi = ] reject ] unit-test [ { CHAR: replacement-character } ] [ { 0b110,00000 0b10,000000 } decode-utf8-w/stream ] unit-test [ { CHAR: replacement-character } ] [ { 0b110,00001 0b10,111111 } decode-utf8-w/stream ] unit-test diff --git a/core/parser/parser.factor b/core/parser/parser.factor index f138544034..04ff5cb7a5 100644 --- a/core/parser/parser.factor +++ b/core/parser/parser.factor @@ -32,7 +32,7 @@ SYMBOL: auto-use? ] [ create-in ] if ; : ignore-forwards ( seq -- seq' ) - [ forward-reference? not ] filter ; + [ forward-reference? ] reject ; : private? ( word -- ? ) vocabulary>> ".private" tail? ; diff --git a/core/source-files/source-files-tests.factor b/core/source-files/source-files-tests.factor index e5e04c777f..cffecb3ee3 100644 --- a/core/source-files/source-files-tests.factor +++ b/core/source-files/source-files-tests.factor @@ -2,4 +2,4 @@ IN: source-files.tests USING: source-files tools.test assocs sequences strings namespaces kernel ; -[ { } ] [ source-files get keys [ string? not ] filter ] unit-test +[ { } ] [ source-files get keys [ string? ] reject ] unit-test diff --git a/extra/alien/fortran/fortran.factor b/extra/alien/fortran/fortran.factor index f760036b40..0dc7b79fc2 100755 --- a/extra/alien/fortran/fortran.factor +++ b/extra/alien/fortran/fortran.factor @@ -442,11 +442,11 @@ MACRO: fortran-invoke ( return library function parameters -- ) SYNTAX: SUBROUTINE: f current-library get scan-token ";" parse-tokens - [ "()" subseq? not ] filter define-fortran-function ; + [ "()" subseq? ] reject define-fortran-function ; SYNTAX: FUNCTION: scan-token current-library get scan-token ";" parse-tokens - [ "()" subseq? not ] filter define-fortran-function ; + [ "()" subseq? ] reject define-fortran-function ; SYNTAX: LIBRARY: scan-token diff --git a/extra/elf/nm/nm.factor b/extra/elf/nm/nm.factor index 52e1c66902..a36ff1f832 100644 --- a/extra/elf/nm/nm.factor +++ b/extra/elf/nm/nm.factor @@ -19,6 +19,6 @@ IN: elf.nm : elf-nm ( path -- ) [ sections dup ".symtab" find-section - symbols [ name>> empty? not ] filter + symbols [ name>> empty? ] reject [ print-symbol ] with each ] with-mapped-elf ; diff --git a/extra/geo-ip/geo-ip.factor b/extra/geo-ip/geo-ip.factor index a14d9335ef..373d0f800f 100644 --- a/extra/geo-ip/geo-ip.factor +++ b/extra/geo-ip/geo-ip.factor @@ -33,7 +33,7 @@ TUPLE: ip-entry from to registry assigned city cntry country ; MEMO: ip-db ( -- seq ) download-db ascii file-lines - [ "#" head? not ] filter "\n" join string>csv + [ "#" head? ] reject "\n" join string>csv [ parse-ip-entry ] map ; : filter-overlaps ( alist -- alist' ) diff --git a/extra/gml/parser/parser.factor b/extra/gml/parser/parser.factor index b2feb6c0b8..60d97b0777 100644 --- a/extra/gml/parser/parser.factor +++ b/extra/gml/parser/parser.factor @@ -120,7 +120,7 @@ Token = Spaces ExecName | PathName) -Tokens = Token* => [[ [ comment? not ] filter ]] +Tokens = Token* => [[ [ comment? ] reject ]] Program = Tokens Spaces !(.) => [[ parse-proc ]] diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor index 08b055e267..82f2a71af8 100755 --- a/extra/gpu/render/render.factor +++ b/extra/gpu/render/render.factor @@ -229,7 +229,7 @@ DEFER: uniform-texture-accessors dup length 1 = [ first swap prefix ] [ [ ] 2sequence ] if ; : uniform-tuple-texture-accessors ( uniform-type -- accessors ) - all-uniform-tuple-slots [ uniform-type>> uniform-type-texture-units zero? not ] filter + all-uniform-tuple-slots [ uniform-type>> uniform-type-texture-units zero? ] reject [ uniform-slot-texture-accessor ] map ; : uniform-texture-accessors ( uniform-type dim -- accessors ) @@ -529,7 +529,7 @@ DEFER: [bind-uniform-tuple] } 3cleave ; : true-subclasses ( class -- seq ) - [ subclasses ] keep [ = not ] curry filter ; + [ subclasses ] keep [ = ] curry reject ; PRIVATE> diff --git a/extra/hashcash/hashcash.factor b/extra/hashcash/hashcash.factor index 2f94f3f2d6..7a22f2fc5d 100644 --- a/extra/hashcash/hashcash.factor +++ b/extra/hashcash/hashcash.factor @@ -26,7 +26,7 @@ IN: hashcash ! Random salt is formed by ascii characters ! between 33 and 126 : available-chars ( -- seq ) - 33 126 [a,b] [ CHAR: : = not ] filter ; + 33 126 [a,b] [ CHAR: : = ] reject ; PRIVATE> diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor index 1487fb9d36..e48f09d660 100644 --- a/extra/html/parser/analyzer/analyzer.factor +++ b/extra/html/parser/analyzer/analyzer.factor @@ -179,7 +179,7 @@ ERROR: undefined-find-nth m n seq quot ; [ bl bl bl bl [ write "=" write ] [ write bl ] bi* nl ] assoc-each ; : form. ( vector -- ) - [ closing?>> not ] filter + [ closing?>> ] reject [ { { [ dup name>> "form" = ] diff --git a/extra/irc/messages/base/base.factor b/extra/irc/messages/base/base.factor index 637039ec02..3e8924dfc6 100644 --- a/extra/irc/messages/base/base.factor +++ b/extra/irc/messages/base/base.factor @@ -98,7 +98,7 @@ M: irc-message set-irc-command ] [ drop ] if* ; : define-irc-class ( class params -- ) - [ { ":" "_" } member? not ] filter + [ { ":" "_" } member? ] reject [ irc-message ] dip define-tuple-class ; : define-irc-parameter-slots ( class params -- ) diff --git a/extra/lint/lint.factor b/extra/lint/lint.factor index 91a87b6d84..2d33c03520 100644 --- a/extra/lint/lint.factor +++ b/extra/lint/lint.factor @@ -232,7 +232,7 @@ SYMBOL: lint-definitions-keys lintable-words load-definitions ! Remove words that are their own definition - [ [ [ def>> ] [ 1quotation ] bi = not ] filter ] assoc-map + [ [ [ def>> ] [ 1quotation ] bi = ] reject ] assoc-map ! Add manual definitions manual-substitutions over '[ _ push-at ] assoc-each @@ -284,7 +284,7 @@ GENERIC: run-lint ( obj -- obj ) M: sequence run-lint ( seq -- seq ) [ dup lint ] { } map>assoc trim-self - [ second empty? not ] filter filter-symbols ; + [ second empty? ] reject filter-symbols ; M: word run-lint ( word -- seq ) 1array run-lint ; diff --git a/extra/macho/macho.factor b/extra/macho/macho.factor index caed787ef8..f7ef4b84ca 100644 --- a/extra/macho/macho.factor +++ b/extra/macho/macho.factor @@ -904,7 +904,7 @@ TYPED: load-commands ( macho: mach_header_32/64 -- load-commands ) [ symtab_command? ] filter ; inline : read-array-string ( uchar-array -- string ) - ascii decode [ 0 = not ] filter ; + ascii decode [ 0 = ] reject ; : segment-sections ( segment-command -- sections ) { diff --git a/extra/mason/test/test.factor b/extra/mason/test/test.factor index fd139d8d8a..465dd68ffa 100644 --- a/extra/mason/test/test.factor +++ b/extra/mason/test/test.factor @@ -22,7 +22,7 @@ M: method word-vocabulary "method-generic" word-prop word-vocabulary ; :: do-step ( errors summary-file details-file -- ) errors - [ error-type +linkage-error+ eq? not ] filter + [ error-type +linkage-error+ eq? ] reject [ file>> ] map members natural-sort summary-file to-file errors details-file utf8 [ errors. ] with-file-writer ; diff --git a/extra/math/extras/extras.factor b/extra/math/extras/extras.factor index 1072b9801b..c8dee82c93 100644 --- a/extra/math/extras/extras.factor +++ b/extra/math/extras/extras.factor @@ -115,7 +115,7 @@ PRIVATE> [ ] [ '[ _ count ] map ] bi* ; inline : nonzero ( seq -- seq' ) - [ zero? not ] filter ; + [ zero? ] reject ; : bartlett ( n -- seq ) dup 1 <= [ 1 = [ 1 1array ] [ { } ] if ] [ @@ -148,10 +148,10 @@ PRIVATE> 0 [ dup fp-nan? [ drop ] [ + ] if ] binary-reduce ; : nan-min ( seq -- n ) - [ fp-nan? not ] filter infimum ; + [ fp-nan? ] reject infimum ; : nan-max ( seq -- n ) - [ fp-nan? not ] filter supremum ; + [ fp-nan? ] reject supremum ; : fill-nans ( seq -- newseq ) [ first ] keep [ diff --git a/extra/otug-talk/otug-talk.factor b/extra/otug-talk/otug-talk.factor index 231700c0e0..db2d90fdaa 100644 --- a/extra/otug-talk/otug-talk.factor +++ b/extra/otug-talk/otug-talk.factor @@ -37,14 +37,14 @@ CONSTANT: otug-slides "Example:" { $code "\"/etc/passwd\" ascii file-lines" - "[ \"#\" head? not ] filter" + "[ \"#\" head? ] reject" "[ \":\" split first ] map" "." } } { $slide "Words" { "We can define new words with " { $snippet ": name ... ;" } " syntax" } - { $code ": remove-comments ( lines -- lines' )" " [ \"#\" head? not ] filter ;" } + { $code ": remove-comments ( lines -- lines' )" " [ \"#\" head? ] reject ;" } { "Words are grouped into " { $emphasis "vocabularies" } } { $link "vocab-index" } "Libraries and applications are vocabularies" @@ -52,13 +52,13 @@ CONSTANT: otug-slides } { $slide "Constructing quotations" { "Suppose we want a " { $snippet "remove-comments*" } " word" } - { $code ": remove-comments* ( lines string -- lines' )" " [ ??? head? not ] filter ;" } + { $code ": remove-comments* ( lines string -- lines' )" " [ ??? head? ] reject ;" } { "We use " { $link POSTPONE: '[ } " instead of " { $link POSTPONE: [ } } { "Create “holes” with " { $link _ } } "Holes filled in left to right when quotation pushed on the stack" } { $slide "Constructing quotations" - { $code ": remove-comments* ( lines string -- lines' )" " '[ _ head? not ] filter ;" "" ": remove-comments ( lines -- lines' )" " \"#\" remove-comments* ;" } + { $code ": remove-comments* ( lines string -- lines' )" " '[ _ head? ] reject ;" "" ": remove-comments ( lines -- lines' )" " \"#\" remove-comments* ;" } { { $link @ } " inserts a quotation" } { $code ": replicate ( n quot -- seq )" " '[ drop @ ] map ;" } { $code "10 [ 1 10 [a,b] random ] replicate ." } diff --git a/extra/project-euler/004/004.factor b/extra/project-euler/004/004.factor index 342e8d1a9e..dbbeb70437 100644 --- a/extra/project-euler/004/004.factor +++ b/extra/project-euler/004/004.factor @@ -21,7 +21,7 @@ IN: project-euler.004 [ diff --git a/extra/resolv-conf/resolv-conf.factor b/extra/resolv-conf/resolv-conf.factor index 2859139e0b..b6eefd2147 100644 --- a/extra/resolv-conf/resolv-conf.factor +++ b/extra/resolv-conf/resolv-conf.factor @@ -90,7 +90,7 @@ PRIVATE> [ ] dip utf8 file-lines [ [ blank? ] trim ] map harvest - [ "#" head? not ] filter + [ "#" head? ] reject [ parse-resolv.conf-line ] each ; : default-resolv.conf ( -- resolv.conf ) diff --git a/extra/robots/robots.factor b/extra/robots/robots.factor index 99b375da38..7562c65d3c 100644 --- a/extra/robots/robots.factor +++ b/extra/robots/robots.factor @@ -35,7 +35,7 @@ visit-time request-rate crawl-delay unknowns ; : normalize-robots.txt ( string -- sitemaps seq ) string-lines [ [ blank? ] trim ] map - [ "#" head? not ] filter harvest + [ "#" head? ] reject harvest [ ":" split1 [ [ blank? ] trim ] bi@ [ >lower ] dip ] { } map>assoc [ first "sitemap" = ] partition [ values ] dip [ diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor index f3a7d10fb6..a925ed8188 100644 --- a/extra/sequences/extras/extras.factor +++ b/extra/sequences/extras/extras.factor @@ -257,7 +257,7 @@ PRIVATE> [ empty? not ] swap filter-as ; : harvest! ( seq -- newseq ) - [ empty? not ] filter! ; + [ empty? ] reject! ; : head-as ( seq n exemplar -- seq' ) [ head-slice ] [ like ] bi* ; inline diff --git a/extra/tools/gc-decode/gc-decode-tests.factor b/extra/tools/gc-decode/gc-decode-tests.factor index 22041fca86..556c8b277a 100644 --- a/extra/tools/gc-decode/gc-decode-tests.factor +++ b/extra/tools/gc-decode/gc-decode-tests.factor @@ -72,7 +72,7 @@ IN: tools.gc-decode.tests { { } } [ all-words [ normal? ] filter 50 sample - [ [ word>gc-info-expected ] [ word>gc-info ] bi same-gc-info? not ] filter + [ [ word>gc-info-expected ] [ word>gc-info ] bi same-gc-info? ] reject ] unit-test : base-pointer-groups-expected ( word -- seq ) diff --git a/extra/youtube/youtube.factor b/extra/youtube/youtube.factor index fde9b05fd6..32c6998863 100644 --- a/extra/youtube/youtube.factor +++ b/extra/youtube/youtube.factor @@ -60,8 +60,8 @@ CONSTANT: video-info-url URL" http://www.youtube.com/get_video_info" [ "url" of ] [ "sig" of ] bi "&signature=" glue ; : sanitize ( title -- title' ) - [ 0 31 between? not ] filter - [ "\"#$%'*,./:;<>?^|~\\" member? not ] filter + [ 0 31 between? ] reject + [ "\"#$%'*,./:;<>?^|~\\" member? ] reject 200 short head ; : download-video ( video-id -- ) diff --git a/unmaintained/adsoda/solution2/solution2.factor b/unmaintained/adsoda/solution2/solution2.factor index fa73120df3..9d59102652 100644 --- a/unmaintained/adsoda/solution2/solution2.factor +++ b/unmaintained/adsoda/solution2/solution2.factor @@ -86,7 +86,7 @@ SYMBOL: matrix [ 0 0 (echelon) ] with-matrix ; : nonzero-rows ( matrix -- matrix' ) - [ [ zero? ] all? not ] filter ; + [ [ zero? ] all? ] reject ; : null/rank ( matrix -- null rank ) echelon dup length swap nonzero-rows length [ - ] keep ; diff --git a/unmaintained/alien/inline/inline.factor b/unmaintained/alien/inline/inline.factor index 6428bead75..b40bc8cce1 100644 --- a/unmaintained/alien/inline/inline.factor +++ b/unmaintained/alien/inline/inline.factor @@ -51,7 +51,7 @@ PRIVATE> : function-types-effect ( -- function types effect ) scan scan swap ")" parse-tokens - [ "(" subseq? not ] filter swap parse-arglist ; + [ "(" subseq? ] reject swap parse-arglist ; : prototype-string ( function types effect -- str ) [ [ cify-type ] map ] dip -- 2.34.1