Bootstrap fix

diff --git a/core/classes/classes-docs.factor b/core/classes/classes-docs.factor
index e637c479334e68451f16ed9cb1602ae385680f59..130844e7972d900b3e67df0d74141a94b5e01c2b 100644 (file)
--- a/core/classes/classes-docs.factor
+++ b/core/classes/classes-docs.factor
@@ -203,17 +203,3 @@ HELP: define-class
 { $values { "word" word } { "members" "a sequence of class words" } { "superclass" class } { "metaclass" class } }
 { $description "Sets a property indicating this word is a class word, thus making it an instance of " { $link class } ", and registers it with " { $link typemap } " and " { $link class<map } "." }
 $low-level-note ;
-
-: $predicate ( element -- )
-    { { "object" object } { "?" "a boolean" } } $values
-    [
-        "Tests if the object is an instance of the " ,
-        first "predicating" word-prop \ $link swap 2array ,
-        " class." ,
-    ] { } make $description ;
-
-M: predicate word-help* drop \ $predicate ;
-
-HELP: $predicate
-{ $values { "element" "a markup element of the form " { $snippet "{ word }" } } }
-{ $description "Prints the boilerplate description of a class membership predicate word such as " { $link array? } " or " { $link integer? } "." } ;

diff --git a/extra/help/help-docs.factor b/extra/help/help-docs.factor
index d2d0b9beaee26f6b83fb6fc8e9d8830a8afaf3b9..fdfa7ddd7b8c50402624da66538612e8e0995cdc 100644 (file)
--- a/extra/help/help-docs.factor
+++ b/extra/help/help-docs.factor
@@ -1,5 +1,5 @@
 USING: help.markup help.crossref help.topics help.syntax
-definitions io prettyprint inspector help.lint ;
+definitions io prettyprint inspector help.lint arrays math ;
 IN: help
 
 ARTICLE: "printing-elements" "Printing markup elements"
@@ -156,3 +156,7 @@ HELP: sort-articles
 { $description "Sorts a sequence of help topics." } ;
 
 { article-children article-parent xref-help } related-words
+
+HELP: $predicate
+{ $values { "element" "a markup element of the form " { $snippet "{ word }" } } }
+{ $description "Prints the boilerplate description of a class membership predicate word such as " { $link array? } " or " { $link integer? } "." } ;

diff --git a/extra/help/help.factor b/extra/help/help.factor
index 975ed73dc842e82a5d5e57d472d796078286a61c..87bc0a4b7f5b83d0453cb10636d0aa5209a3d298 100644 (file)
--- a/extra/help/help.factor
+++ b/extra/help/help.factor
@@ -4,7 +4,7 @@ USING: arrays io kernel namespaces parser prettyprint sequences
 words assocs definitions generic quotations effects
 slots continuations tuples debugger combinators
 vocabs help.stylesheet help.topics help.crossref help.markup
-sorting ;
+sorting classes ;
 IN: help
 
 GENERIC: word-help* ( word -- content )
@@ -15,12 +15,22 @@ GENERIC: word-help* ( word -- content )
         [ swap 2array 1array ] [ 2drop f ] if
     ] ?if ;
 
+: $predicate ( element -- )
+    { { "object" object } { "?" "a boolean" } } $values
+    [
+        "Tests if the object is an instance of the " ,
+        first "predicating" word-prop \ $link swap 2array ,
+        " class." ,
+    ] { } make $description ;
+
 M: word word-help* drop f ;
 
 M: slot-reader word-help* drop \ $slot-reader ;
 
 M: slot-writer word-help* drop \ $slot-writer ;
 
+M: predicate word-help* drop \ $predicate ;
+
 : all-articles ( -- seq )
     articles get keys
     all-words [ word-help ] subset append ;