make some predicates return t/f instead of something/f.

diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
index 4783be9ce1e95d116eae5b3c0fdadc8e9c8f2110..4f435c93d006882a0d7b8536cc370cfd2ba4fcdd 100644 (file)
--- 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> pointer

diff --git a/basis/alien/parser/parser.factor b/basis/alien/parser/parser.factor
index 63d0377e29d42e1d8b5c7c3aa260d4be244eefb9..e3c33a3ba08f5a58b956f55868947a72f15e6d53 100755 (executable)
--- 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 16e1967aa6bd8af7fda1119838ffdb879f4105f9..1684c8c46867f6d367238c2ca9e4729ccd576465 100644 (file)
--- 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 9a5b32c65afc14e9bf87c320b198fd200cfb9dde..5f6a8bac2b9605f38d55887828e98f2fd783d726 100644 (file)
--- 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 bd0cd8d77c23cd65c03a5ad27aba14ac8edd56a8..8750dfdd931a1c468597cabdb23e6b13021c6f63 100644 (file)
--- 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 5f03bd87a6b581eb2e30b1ac6c94229dd127ff6f..408c4b83a8ecea04706e788e6695998fcedb12af 100644 (file)
--- 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 dec94d76bf854cc5223f9b627a30bc9d30910323..112540bc91a0c87e3dd1a8d1d9bfb1dac1e7cc08 100644 (file)
--- 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 77717a0f067ae0291180570340d07d53b5926e1e..1469b898e2ffd92b1d15d987324a18a60895b77d 100644 (file)
--- 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 d566b83ac022afa78e03127f349b21b18de6fc9c..76a214dacdb1d9fe024c97bcabd6ce381c014d39 100644 (file)
--- 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 ;