diff --git a/basis/db/sqlite/sqlite.factor b/basis/db/sqlite/sqlite.factor index aa71d0ac1d..bc849f5ee6 100644 --- a/basis/db/sqlite/sqlite.factor +++ b/basis/db/sqlite/sqlite.factor @@ -256,7 +256,7 @@ M: sqlite-db-connection persistent-table ( -- assoc ) " interpolate>string ; : can-be-null? ( -- ? ) - "sql-spec" get modifiers>> [ +not-null+ = ] any? not ; + "sql-spec" get modifiers>> [ +not-null+ = ] none? ; : delete-cascade? ( -- ? ) "sql-spec" get modifiers>> { +on-delete+ +cascade+ } swap subseq? ; diff --git a/basis/math/primes/erato/fast/fast.factor b/basis/math/primes/erato/fast/fast.factor index d52981dba4..ee957afa94 100644 --- a/basis/math/primes/erato/fast/fast.factor +++ b/basis/math/primes/erato/fast/fast.factor @@ -11,7 +11,7 @@ IN: math.primes.erato.fast CONSTANT: wheel-2-3-5-7 $[ 11 dup 210 + [a,b] [ - { 2 3 5 7 } [ divisor? ] with any? not + { 2 3 5 7 } [ divisor? ] with none? ] B{ } filter-as differences ] diff --git a/basis/math/primes/miller-rabin/miller-rabin.factor b/basis/math/primes/miller-rabin/miller-rabin.factor index 94707c990d..135073f9a8 100644 --- a/basis/math/primes/miller-rabin/miller-rabin.factor +++ b/basis/math/primes/miller-rabin/miller-rabin.factor @@ -18,9 +18,9 @@ IN: math.primes.miller-rabin ] [ r [ 2^ s * a swap n ^mod n-1 = - ] any? not + ] none? ] if - ] any? not ; + ] none? ; PRIVATE> diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor index 5f58951fce..ea54fb2085 100644 --- a/basis/peg/ebnf/ebnf.factor +++ b/basis/peg/ebnf/ebnf.factor @@ -425,7 +425,7 @@ M: ebnf-sequence build-locals ( code ast -- code ) elements>> filter-hidden dup length 1 = [ first build-locals ] [ - dup [ ebnf-var? ] any? not [ + dup [ ebnf-var? ] none? [ drop ] [ [ diff --git a/basis/xml/xml.factor b/basis/xml/xml.factor index 8b855bd4dd..b1e7d71429 100644 --- a/basis/xml/xml.factor +++ b/basis/xml/xml.factor @@ -31,7 +31,7 @@ M: prolog process : before-main? ( -- ? ) xml-stack get { [ length 1 = ] - [ first second [ tag? ] any? not ] + [ first second [ tag? ] none? ] } 1&& ; M: directive process diff --git a/core/classes/algebra/algebra.factor b/core/classes/algebra/algebra.factor index 0103126d6a..8b92932adc 100644 --- a/core/classes/algebra/algebra.factor +++ b/core/classes/algebra/algebra.factor @@ -273,7 +273,7 @@ PRIVATE> ERROR: topological-sort-failed ; : largest-class ( seq -- n elt ) - dup [ [ class< ] with any? not ] curry find-last + dup [ [ class< ] with none? ] curry find-last [ topological-sort-failed ] unless* ; : sort-classes ( seq -- newseq ) diff --git a/core/combinators/combinators.factor b/core/combinators/combinators.factor index abfea43001..c1fef4287a 100644 --- a/core/combinators/combinators.factor +++ b/core/combinators/combinators.factor @@ -184,7 +184,7 @@ PRIVATE> { [ dup empty? ] [ 2drop ] } { [ dup [ length 4 <= ] [ [ word? ] any? ] bi or ] [ drop linear-case-quot ] } { [ dup contiguous-range? ] [ drop dispatch-case-quot ] } - { [ dup [ wrapper? ] any? not ] [ drop hash-case-quot ] } + { [ dup [ wrapper? ] none? ] [ drop hash-case-quot ] } { [ dup [ wrapper? ] all? ] [ drop [ [ wrapped>> ] dip ] assoc-map hash-case-quot ] } [ drop linear-case-quot ] } cond ; diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor index 37f487d1a6..dbcea5bf41 100644 --- a/core/compiler/units/units.factor +++ b/core/compiler/units/units.factor @@ -39,7 +39,7 @@ PRIVATE> : forward-reference? ( word -- ? ) dup old-definitions get [ in? ] with any? [ - new-definitions get [ in? ] with any? not + new-definitions get [ in? ] with none? ] [ drop f ] if ; SYMBOL: compiler-impl diff --git a/extra/arrays/shaped/shaped.factor b/extra/arrays/shaped/shaped.factor index 81c2a48fe2..ab19138af4 100644 --- a/extra/arrays/shaped/shaped.factor +++ b/extra/arrays/shaped/shaped.factor @@ -5,7 +5,7 @@ grouping kernel math math.functions math.order math.vectors parser prettyprint.custom sequences sequences.deep ; IN: arrays.shaped -: flat? ( array -- ? ) [ sequence? ] any? not ; inline +: flat? ( array -- ? ) [ sequence? ] none? ; inline GENERIC: array-replace ( object -- shape ) diff --git a/extra/codebook/codebook.factor b/extra/codebook/codebook.factor index 39e91b7ef9..673587aa3c 100644 --- a/extra/codebook/codebook.factor +++ b/extra/codebook/codebook.factor @@ -45,7 +45,7 @@ TUPLE: code-file : include-file-name? ( name -- ? ) { - [ path-components [ "." head? ] any? not ] + [ path-components [ "." head? ] none? ] [ link-info regular-file? ] } 1&& ; diff --git a/extra/math/primes/solovay-strassen/solovay-strassen.factor b/extra/math/primes/solovay-strassen/solovay-strassen.factor index ac4eb70768..c0cedced68 100644 --- a/extra/math/primes/solovay-strassen/solovay-strassen.factor +++ b/extra/math/primes/solovay-strassen/solovay-strassen.factor @@ -16,7 +16,7 @@ IN: math.primes.solovay-strassen a n jacobi n mod' a n 1 - 2 /i n ^mod = not ] if - ] any? not ; + ] none? ; PRIVATE> diff --git a/extra/minesweeper/minesweeper.factor b/extra/minesweeper/minesweeper.factor index 6569bab9d1..a105991f8b 100644 --- a/extra/minesweeper/minesweeper.factor +++ b/extra/minesweeper/minesweeper.factor @@ -73,7 +73,7 @@ TUPLE: cell #adjacent mined? state ; { [ lost? ] [ won? ] } 1|| ; : new-game? ( cells -- ? ) - [ [ state>> +clicked+ = ] any? ] any? not ; + [ [ state>> +clicked+ = ] any? ] none? ; DEFER: click-cell-at diff --git a/extra/multi-methods/multi-methods.factor b/extra/multi-methods/multi-methods.factor index f5637789ea..6a362bbef1 100644 --- a/extra/multi-methods/multi-methods.factor +++ b/extra/multi-methods/multi-methods.factor @@ -76,7 +76,7 @@ SYMBOL: total ! Part II: Topologically sorting specializers : maximal-element ( seq quot -- n elt ) dupd [ - swapd [ call +lt+ = ] 2curry any? not + swapd [ call +lt+ = ] 2curry none? ] 2curry find [ "Topological sort failed" throw ] unless* ; inline diff --git a/extra/project-euler/035/035.factor b/extra/project-euler/035/035.factor index 2b50634f1d..0824151ffa 100644 --- a/extra/project-euler/035/035.factor +++ b/extra/project-euler/035/035.factor @@ -28,7 +28,7 @@ IN: project-euler.035 : possible? ( seq -- ? ) dup length 1 > [ - [ even? ] any? not + [ even? ] none? ] [ drop t ] if ;