fix erronous declaration

TODO.FACTOR.txt

@@ -39,3 +39,4 @@
 - stream server can hang because of exception handler limitations
 - better i/o scheduler
 - if two tasks write to a unix stream, the buffer can overflow
+- inference bug

library/bootstrap/boot-stage1.factor

@@ -105,8 +105,6 @@ vectors words ;
         "/library/io/server.factor"
         "/library/tools/jedit.factor"
 
-        "/library/bootstrap/image.factor"
-
         "/library/compiler/architecture.factor"
 
         "/library/inference/shuffle.factor"
@@ -198,6 +196,8 @@ vectors words ;
         "/library/help/syntax.factor"
 
         "/library/syntax/parse-syntax.factor"
+
+        "/library/bootstrap/image.factor"
     } [ parse-resource % ] each
     
     architecture get {

library/bootstrap/image.factor

@@ -9,7 +9,7 @@
 ! strings etc to the image file in the CFactor object memory
 ! format.
 
-USING: alien arrays errors generic hashtables io kernel
+USING: alien arrays errors generic hashtables help io kernel
 kernel-internals lists math namespaces parser prettyprint
 sequences sequences-internals strings vectors words ;
 IN: image
@@ -291,7 +291,10 @@ M: hashtable ' ( hashtable -- pointer )
 
 : global, ( -- )
     [
-        { vocabularies typemap builtins c-types crossref }
+        {
+            vocabularies typemap builtins c-types crossref
+            articles terms
+        }
         [ [ ] change ] each
     ] make-hash '
     global-offset fixup ;

library/bootstrap/primitives.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2005 Slava Pestov.
 ! See http://factor.sf.net/license.txt for BSD license.
 IN: image
-USING: alien arrays generic hashtables io kernel
+USING: alien arrays generic hashtables help io kernel
 kernel-internals lists math namespaces parser sequences strings
 vectors words ;
 
@@ -15,12 +15,18 @@ H{ } clone c-types set
 
 ! These symbols need the same hashcode in the target as in the
 ! host.
-{ vocabularies typemap builtins c-types cell }
+{
+    vocabularies typemap builtins c-types
+    cell crossref articles terms
+}
 
 ! Bring up a bare cross-compiling vocabulary.
 "syntax" vocab
 
 H{ } clone vocabularies set
+H{ } clone articles set
+H{ } clone terms set
+
 crossref off
 
 vocabularies get [ "syntax" set [ reveal ] each ] bind

library/help/help.factor

@@ -14,6 +14,3 @@ io kernel namespaces parser sequences words ;
 "Show word documentation" [ word? ] [ help ] \ in-browser define-command
 "Show term definition" [ term? ] [ help ] \ in-browser define-default-command
 "Show article" [ link? ] [ help ] \ in-browser define-default-command
-
-H{ } clone articles set-global
-H{ } clone terms set-global

library/help/tutorial.factor

@@ -179,6 +179,3 @@ ARTICLE: "tutorial" "Factor tutorial"
 { $subsection "tutorial-more" } ;
 
 : tutorial "tutorial" help ;
-
-: <tutorial-button>
-    "Factor tutorial" "tutorial" <link> simple-object terpri ;

library/inference/known-words.factor

@@ -507,5 +507,5 @@ sequences strings vectors words prettyprint ;
 
 \ flush-icache [ [ ] [ ] ] "infer-effect" set-word-prop
 
-\ <string> [ [ integer integer ] [ array ] ] "infer-effect" set-word-prop
+\ <string> [ [ integer integer ] [ string ] ] "infer-effect" set-word-prop
 \ <string> t "flushable" set-word-prop

library/ui/commands.factor

@@ -66,7 +66,8 @@ C: command-button ( gadget object -- button )
 M: command-button gadget-help ( button -- string )
     command-button-object dup word? [ synopsis ] [ summary ] if ;
 
-"Describe" [ drop t ] [ describe ] \ in-browser define-default-command
+"Describe object" [ drop t ] [ describe ] \ in-browser define-default-command
+"Describe commands" [ drop t ] [ applicable describe ] \ in-browser define-default-command
 "Prettyprint" [ drop t ] [ . ] \ in-listener define-command
 "Push on data stack" [ drop t ] [ ] \ in-listener define-command
 

library/ui/listener.factor

@@ -1,14 +1,14 @@
 ! Copyright (C) 2005 Slava Pestov.
 ! See http://factor.sf.net/license.txt for BSD license.
 IN: help
-DEFER: <tutorial-button>
+DEFER: <link>
 
 IN: gadgets-listener
 USING: arrays compiler gadgets gadgets-editors gadgets-labels
 gadgets-layouts gadgets-panes gadgets-scrolling
-gadgets-splitters gadgets-theme generic hashtables inference
+gadgets-splitters gadgets-theme generic hashtables
-inspector io jedit kernel listener lists math namespaces parser
+inference inspector io jedit kernel listener lists math
-prettyprint sequences shells threads words ;
+namespaces parser prettyprint sequences shells threads words ;
 
 SYMBOL: stack-bar
 SYMBOL: browser-pane
@@ -44,10 +44,13 @@ SYMBOL: browser-pane
     datastack-hook get call stack-bar get show-stack
     word-completion ;
 
+: tutorial-button
+    "Factor tutorial" "tutorial" <link> simple-object terpri ;
+
 : listener-thread
     pane get [
         [ ui-listener-hook ] listener-hook set
-        <tutorial-button>
+        tutorial-button
         tty
     ] with-stream* ;
 

library/ui/presentations.factor

@@ -83,6 +83,7 @@ M: gadget-stream stream-format ( string style stream -- )
     apply-border-width-style
     apply-border-color-style
     apply-page-color-style
+    apply-command-style
     apply-outliner-style
     nip ;