From 934b307ba21dc34430b3604d6c3a3ee6a0a245e3 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 29 Jul 2012 10:52:46 -0700 Subject: [PATCH] make some predicates return t/f instead of something/f. --- basis/alien/c-types/c-types.factor | 2 +- basis/alien/parser/parser.factor | 2 +- basis/delegate/delegate.factor | 3 ++- basis/inverse/inverse.factor | 6 +++--- basis/memoize/memoize.factor | 2 +- basis/typed/prettyprint/prettyprint.factor | 3 ++- extra/descriptive/descriptive.factor | 2 +- extra/variables/variables.factor | 6 +++--- extra/variants/variants.factor | 4 ++-- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor index 4783be9ce1..4f435c93d0 100644 --- a/basis/alien/c-types/c-types.factor +++ b/basis/alien/c-types/c-types.factor @@ -45,7 +45,7 @@ M: no-c-type summary drop "Not a C type" ; GENERIC: lookup-c-type ( name -- c-type ) foldable PREDICATE: c-type-word < word - "c-type" word-prop ; + "c-type" word-prop >boolean ; TUPLE: pointer { to initial: void read-only } ; C: pointer diff --git a/basis/alien/parser/parser.factor b/basis/alien/parser/parser.factor index 63d0377e29..e3c33a3ba0 100755 --- a/basis/alien/parser/parser.factor +++ b/basis/alien/parser/parser.factor @@ -171,7 +171,7 @@ PREDICATE: alien-function-word < alien-function-alias-word [ def>> third ] [ name>> ] bi = ; PREDICATE: alien-callback-type-word < typedef-word - "callback-effect" word-prop ; + "callback-effect" word-prop >boolean ; : global-quot ( type word -- quot ) swap [ name>> current-library get ] dip diff --git a/basis/delegate/delegate.factor b/basis/delegate/delegate.factor index 16e1967aa6..1684c8c468 100644 --- a/basis/delegate/delegate.factor +++ b/basis/delegate/delegate.factor @@ -54,7 +54,8 @@ TUPLE: broadcast < consultation ; [ class>> swap first create-method dup fake-definition ] keep [ drop ] [ "consultation" set-word-prop ] 2bi ; -PREDICATE: consult-method < method "consultation" word-prop ; +PREDICATE: consult-method < method + "consultation" word-prop >boolean ; M: consult-method reset-word [ call-next-method ] [ f "consultation" set-word-prop ] bi ; diff --git a/basis/inverse/inverse.factor b/basis/inverse/inverse.factor index 9a5b32c65a..5f6a8bac2b 100644 --- a/basis/inverse/inverse.factor +++ b/basis/inverse/inverse.factor @@ -61,9 +61,9 @@ ERROR: bad-math-inverse ; : undo-literal ( object -- quot ) [ =/fail ] curry ; -PREDICATE: normal-inverse < word "inverse" word-prop ; -PREDICATE: math-inverse < word "math-inverse" word-prop ; -PREDICATE: pop-inverse < word "pop-length" word-prop ; +PREDICATE: normal-inverse < word "inverse" word-prop >boolean ; +PREDICATE: math-inverse < word "math-inverse" word-prop >boolean ; +PREDICATE: pop-inverse < word "pop-length" word-prop >boolean ; UNION: explicit-inverse normal-inverse math-inverse pop-inverse ; : enough? ( stack word -- ? ) diff --git a/basis/memoize/memoize.factor b/basis/memoize/memoize.factor index bd0cd8d77c..8750dfdd93 100644 --- a/basis/memoize/memoize.factor +++ b/basis/memoize/memoize.factor @@ -72,7 +72,7 @@ SYNTAX: MEMO: (:) define-memoized ; SYNTAX: IDENTITY-MEMO: (:) define-identity-memoized ; -PREDICATE: memoized < word "memoize" word-prop ; +PREDICATE: memoized < word "memoize" word-prop >boolean ; M: memoized definer drop \ MEMO: \ ; ; diff --git a/basis/typed/prettyprint/prettyprint.factor b/basis/typed/prettyprint/prettyprint.factor index 5f03bd87a6..408c4b83a8 100644 --- a/basis/typed/prettyprint/prettyprint.factor +++ b/basis/typed/prettyprint/prettyprint.factor @@ -2,7 +2,8 @@ USING: definitions kernel locals.definitions see see.private typed words summary make accessors classes prettyprint ; IN: typed.prettyprint -PREDICATE: typed-lambda-word < lambda-word "typed-word" word-prop ; +PREDICATE: typed-lambda-word < lambda-word + "typed-word" word-prop >boolean ; M: typed-word definer drop \ TYPED: \ ; ; M: typed-lambda-word definer drop \ TYPED:: \ ; ; diff --git a/extra/descriptive/descriptive.factor b/extra/descriptive/descriptive.factor index dec94d76bf..112540bc91 100644 --- a/extra/descriptive/descriptive.factor +++ b/extra/descriptive/descriptive.factor @@ -38,7 +38,7 @@ PRIVATE> SYNTAX: DESCRIPTIVE: (:) define-descriptive ; PREDICATE: descriptive < word - "descriptive-definition" word-prop ; + "descriptive-definition" word-prop >boolean ; M: descriptive definer drop \ DESCRIPTIVE: \ ; ; diff --git a/extra/variables/variables.factor b/extra/variables/variables.factor index 77717a0f06..1469b898e2 100644 --- a/extra/variables/variables.factor +++ b/extra/variables/variables.factor @@ -7,7 +7,7 @@ FROM: help.markup.private => link-effect? ; IN: variables PREDICATE: variable < word - "variable-setter" word-prop ; + "variable-setter" word-prop >boolean ; GENERIC: variable-setter ( word -- word' ) @@ -35,7 +35,7 @@ SYNTAX: set: dup [ [variable-getter] ] [ [variable-setter] ] bi (define-variable) ; SYNTAX: VAR: - scan-new-word define-variable ; + scan-new-word define-variable ; M: variable definer drop \ VAR: f ; M: variable definition drop f ; @@ -43,7 +43,7 @@ M: variable link-effect? drop f ; M: variable print-stack-effect? drop f ; PREDICATE: typed-variable < variable - "variable-type" word-prop ; + "variable-type" word-prop >boolean ; : [typed-getter] ( quot type -- quot ) 1array '[ @ _ declare ] ; diff --git a/extra/variants/variants.factor b/extra/variants/variants.factor index d566b83ac0..76a214dacd 100644 --- a/extra/variants/variants.factor +++ b/extra/variants/variants.factor @@ -5,7 +5,7 @@ classes.union combinators inverse kernel lexer macros make parser quotations sequences slots splitting words ; IN: variants -PREDICATE: variant-class < mixin-class "variant" word-prop ; +PREDICATE: variant-class < mixin-class "variant?" word-prop ; M: variant-class initial-value* dup members [ drop f f ] @@ -19,7 +19,7 @@ M: variant-class initial-value* dup array? [ first3 pick [ define-tuple-class-and-boa-word ] dip ] [ dup define-singleton-class ] if ; : define-variant-class ( class -- ) - [ define-mixin-class ] [ t "variant" set-word-prop ] bi ; + [ define-mixin-class ] [ t "variant?" set-word-prop ] bi ; : define-variant-class-member ( class member -- ) define-variant-member swap add-mixin-instance ; -- 2.34.1