FUEL: Subvocabularies factored out from fuel.

extra/fuel/eval/authors.txt

@@ -0,0 +1 @@
+Jose Antonio Ortega Ruiz

extra/fuel/eval/eval-tests.factor

@@ -0,0 +1,4 @@
+! Copyright (C) 2009 Jose Antonio Ortega Ruiz.
+! See http://factorcode.org/license.txt for BSD license.
+USING: tools.test fuel.eval ;
+IN: fuel.eval.tests

extra/fuel/eval/eval.factor

@@ -0,0 +1,75 @@
+! Copyright (C) 2009 Jose Antonio Ortega Ruiz.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors arrays compiler.units continuations debugger
+fuel.pprint io io.streams.string kernel namespaces parser sequences
+vectors vocabs.parser ;
+
+IN: fuel.eval
+
+TUPLE: fuel-status in use restarts ;
+
+SYMBOL: fuel-status-stack
+V{ } clone fuel-status-stack set-global
+
+SYMBOL: fuel-eval-result
+f fuel-eval-result set-global
+
+SYMBOL: fuel-eval-output
+f fuel-eval-result set-global
+
+SYMBOL: fuel-eval-res-flag
+t fuel-eval-res-flag set-global
+
+: fuel-eval-restartable? ( -- ? )
+    fuel-eval-res-flag get-global ; inline
+
+: fuel-push-status ( -- )
+    in get use get clone restarts get-global clone
+    fuel-status boa
+    fuel-status-stack get push ;
+
+: fuel-pop-restarts ( restarts -- )
+    fuel-eval-restartable? [ drop ] [ clone restarts set-global ] if ; inline
+
+: fuel-pop-status ( -- )
+    fuel-status-stack get empty? [
+        fuel-status-stack get pop
+        [ in>> in set ]
+        [ use>> clone use set ]
+        [ restarts>> fuel-pop-restarts ] tri
+    ] unless ;
+
+: fuel-forget-error ( -- ) f error set-global ; inline
+: fuel-forget-result ( -- ) f fuel-eval-result set-global ; inline
+: fuel-forget-output ( -- ) f fuel-eval-output set-global ; inline
+: fuel-forget-status ( -- )
+    fuel-forget-error fuel-forget-result fuel-forget-output ; inline
+
+: fuel-send-retort ( -- )
+    error get fuel-eval-result get-global fuel-eval-output get-global
+    3array fuel-pprint flush nl "<~FUEL~>" write nl flush ;
+
+: (fuel-begin-eval) ( -- )
+    fuel-push-status fuel-forget-status ; inline
+
+: (fuel-end-eval) ( output -- )
+    fuel-eval-output set-global fuel-send-retort fuel-pop-status ; inline
+
+: (fuel-eval) ( lines -- )
+    [ [ parse-lines ] with-compilation-unit call ] curry
+    [ print-error ] recover ; inline
+
+: (fuel-eval-each) ( lines -- )
+    [ 1vector (fuel-eval) ] each ; inline
+
+: (fuel-eval-usings) ( usings -- )
+    [ "USING: " prepend " ;" append ] map
+    (fuel-eval-each) fuel-forget-error fuel-forget-output ;
+
+: (fuel-eval-in) ( in -- )
+    [ dup "IN: " prepend 1vector (fuel-eval) in set ] when* ; inline
+
+: (fuel-eval-in-context) ( lines in usings -- )
+    (fuel-begin-eval)
+    [ (fuel-eval-usings) (fuel-eval-in) (fuel-eval) ] with-string-writer
+    (fuel-end-eval) ;

extra/fuel/fuel.factor

@@ -1,34 +1,14 @@
 ! Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz.
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: accessors arrays assocs classes.tuple combinators
+USING: accessors arrays assocs compiler.units definitions fuel.eval
-compiler.units continuations debugger definitions help help.crossref
+fuel.help help.markup help.topics io.pathnames kernel math math.order
-help.markup help.topics io io.pathnames io.streams.string kernel lexer
+memoize namespaces parser sequences sets sorting tools.crossref
-make math math.order memoize namespaces parser prettyprint quotations
+tools.scaffold tools.vocabs vocabs vocabs.loader vocabs.parser words ;
-sequences sets sorting source-files strings summary tools.crossref
-tools.scaffold tools.vocabs tools.vocabs.browser vectors vocabs
-vocabs.loader vocabs.parser words ;
 
 IN: fuel
 
-! Evaluation status:
+! Evaluation
-
-TUPLE: fuel-status in use restarts ;
-
-SYMBOL: fuel-status-stack
-V{ } clone fuel-status-stack set-global
-
-SYMBOL: fuel-eval-result
-f fuel-eval-result set-global
-
-SYMBOL: fuel-eval-output
-f fuel-eval-result set-global
-
-SYMBOL: fuel-eval-res-flag
-t fuel-eval-res-flag set-global
-
-: fuel-eval-restartable? ( -- ? )
-    fuel-eval-res-flag get-global ; inline
 
 : fuel-eval-restartable ( -- )
     t fuel-eval-res-flag set-global ; inline
@@ -36,156 +16,64 @@ t fuel-eval-res-flag set-global
 : fuel-eval-non-restartable ( -- )
     f fuel-eval-res-flag set-global ; inline
 
-: fuel-push-status ( -- )
+: fuel-eval-in-context ( lines in usings -- )
-    in get use get clone restarts get-global clone
+    (fuel-eval-in-context) ;
-    fuel-status boa
-    fuel-status-stack get push ;
-
-: fuel-pop-restarts ( restarts -- )
-    fuel-eval-restartable? [ drop ] [ clone restarts set-global ] if ; inline
-
-: fuel-pop-status ( -- )
-    fuel-status-stack get empty? [
-        fuel-status-stack get pop
-        [ in>> in set ]
-        [ use>> clone use set ]
-        [ restarts>> fuel-pop-restarts ] tri
-    ] unless ;
-
-! Lispy pretty printing
-
-GENERIC: fuel-pprint ( obj -- )
-
-M: object fuel-pprint pprint ; inline
-
-: fuel-maybe-scape ( ch -- seq )
-    dup "\\\"?#()[]'`" member? [ CHAR: \ swap 2array ] [ 1array ] if ;
-
-M: word fuel-pprint
-    name>> V{ } clone [ fuel-maybe-scape append ] reduce >string write ;
-
-M: f fuel-pprint drop "nil" write ; inline
-
-M: integer fuel-pprint pprint ; inline
-
-M: string fuel-pprint pprint ; inline
-
-: fuel-pprint-sequence ( seq open close -- )
-    [ write ] dip swap [ " " write ] [ fuel-pprint ] interleave write ; inline
-
-M: sequence fuel-pprint "(" ")" fuel-pprint-sequence ; inline
-
-M: quotation fuel-pprint "[" "]" fuel-pprint-sequence ; inline
-
-M: tuple fuel-pprint tuple>array fuel-pprint ; inline
-
-M: continuation fuel-pprint drop ":continuation" write ; inline
-
-M: restart fuel-pprint name>> fuel-pprint ; inline
-
-SYMBOL: :restarts
-
-: fuel-restarts ( obj -- seq )
-    compute-restarts :restarts prefix ; inline
-
-M: condition fuel-pprint
-    [ error>> ] [ fuel-restarts ] bi 2array condition prefix fuel-pprint ;
-
-M: lexer-error fuel-pprint
-    {
-        [ line>> ]
-        [ column>> ]
-        [ line-text>> ]
-        [ fuel-restarts ]
-    } cleave 4array lexer-error prefix fuel-pprint ;
-
-M: source-file-error fuel-pprint
-    [ file>> ] [ error>> ] bi 2array source-file-error prefix
-    fuel-pprint ;
-
-M: source-file fuel-pprint path>> fuel-pprint ;
-
-! Evaluation vocabulary
 
 : fuel-eval-set-result ( obj -- )
     clone fuel-eval-result set-global ; inline
 
-: fuel-retort ( -- )
+: fuel-retort ( -- ) fuel-send-retort ; inline
-    error get fuel-eval-result get-global fuel-eval-output get-global
-    3array fuel-pprint flush nl "<~FUEL~>" write nl flush ;
-
-: fuel-forget-error ( -- ) f error set-global ; inline
-: fuel-forget-result ( -- ) f fuel-eval-result set-global ; inline
-: fuel-forget-output ( -- ) f fuel-eval-output set-global ; inline
-: fuel-forget-status ( -- )
-    fuel-forget-error fuel-forget-result fuel-forget-output ; inline
-
-: (fuel-begin-eval) ( -- )
-    fuel-push-status fuel-forget-status ; inline
-
-: (fuel-end-eval) ( output -- )
-    fuel-eval-output set-global fuel-retort fuel-pop-status ; inline
-
-: (fuel-eval) ( lines -- )
-    [ [ parse-lines ] with-compilation-unit call ] curry
-    [ print-error ] recover ; inline
-
-: (fuel-eval-each) ( lines -- )
-    [ 1vector (fuel-eval) ] each ; inline
-
-: (fuel-eval-usings) ( usings -- )
-    [ "USING: " prepend " ;" append ] map
-    (fuel-eval-each) fuel-forget-error fuel-forget-output ;
-
-: (fuel-eval-in) ( in -- )
-    [ dup "IN: " prepend 1vector (fuel-eval) in set ] when* ; inline
-
-: fuel-eval-in-context ( lines in usings -- )
-    (fuel-begin-eval)
-    [ (fuel-eval-usings) (fuel-eval-in) (fuel-eval) ] with-string-writer
-    (fuel-end-eval) ;
 
 ! Loading files
 
+<PRIVATE
+
 SYMBOL: :uses
 
 : fuel-set-use-hook ( -- )
     [ amended-use get clone :uses prefix fuel-eval-set-result ]
     print-use-hook set ;
 
+: (fuel-get-uses) ( lines -- )
+    [ parse-fresh drop ] curry with-compilation-unit ; inline
+
+PRIVATE>
+
 : fuel-run-file ( path -- )
     [ fuel-set-use-hook run-file ] curry with-scope ; inline
 
 : fuel-with-autouse ( ... quot: ( ... -- ... ) -- ... )
     [ auto-use? on fuel-set-use-hook call ] curry with-scope ; inline
 
-: (fuel-get-uses) ( lines -- )
-    [ parse-fresh drop ] curry with-compilation-unit ; inline
-
 : fuel-get-uses ( lines -- )
     [ (fuel-get-uses) ] curry fuel-with-autouse ;
 
 ! Edit locations
 
+<PRIVATE
+
 : fuel-normalize-loc ( seq -- path line )
     [ dup length 0 > [ first (normalize-path) ] [ drop f ] if ]
     [ dup length 1 > [ second ] [ drop 1 ] if ] bi ;
 
-: fuel-get-edit-location ( word -- )
+: fuel-get-loc ( object -- )
-    where fuel-normalize-loc 2array fuel-eval-set-result ; inline
+    fuel-normalize-loc 2array fuel-eval-set-result ;
+
+PRIVATE>
+
+: fuel-get-edit-location ( word -- ) where fuel-get-loc ; inline
 
 : fuel-get-vocab-location ( vocab -- )
     >vocab-link fuel-get-edit-location ; inline
 
-: fuel-get-doc-location ( word -- )
+: fuel-get-doc-location ( word -- ) props>> "help-loc" swap at fuel-get-loc ;
-    props>> "help-loc" swap at
-    fuel-normalize-loc 2array fuel-eval-set-result ;
 
-: fuel-get-article-location ( name -- )
+: fuel-get-article-location ( name -- ) article loc>> fuel-get-loc ;
-    article loc>> fuel-normalize-loc 2array fuel-eval-set-result ;
 
 ! Cross-references
 
+<PRIVATE
+
 : fuel-word>xref ( word -- xref )
     [ name>> ] [ vocabulary>> ] [ where fuel-normalize-loc ] tri 4array ;
 
@@ -195,6 +83,11 @@ SYMBOL: :uses
 : fuel-format-xrefs ( seq -- seq' )
     [ word? ] filter [ fuel-word>xref ] map ; inline
 
+: (fuel-index) ( seq -- seq )
+    [ [ >link name>> ] [ article-title ] bi 2array \ $subsection prefix ] map ;
+
+PRIVATE>
+
 : fuel-callers-xref ( word -- )
     usage fuel-format-xrefs fuel-sort-xrefs fuel-eval-set-result ; inline
 
@@ -207,23 +100,19 @@ SYMBOL: :uses
 : fuel-vocab-xref ( vocab -- )
     words fuel-format-xrefs fuel-eval-set-result ; inline
 
+: fuel-index ( quot: ( -- seq ) -- )
+    call (fuel-index) fuel-eval-set-result ; inline
+
 ! Completion support
 
+<PRIVATE
+
 : fuel-filter-prefix ( seq prefix -- seq )
     [ drop-prefix nip length 0 = ] curry filter prune ; inline
 
 : (fuel-get-vocabs) ( -- seq )
     all-vocabs-seq [ vocab-name ] map ; inline
 
-: fuel-get-vocabs ( -- )
-    (fuel-get-vocabs) fuel-eval-set-result ; inline
-
-: fuel-get-vocabs/prefix ( prefix -- )
-    (fuel-get-vocabs) swap fuel-filter-prefix fuel-eval-set-result ; inline
-
-: fuel-vocab-summary ( name -- )
-    >vocab-link summary fuel-eval-set-result ; inline
-
 MEMO: (fuel-vocab-words) ( name -- seq )
     >vocab-link words [ name>> ] map ;
 
@@ -237,137 +126,39 @@ MEMO: (fuel-vocab-words) ( name -- seq )
     [ fuel-vocabs-words ] [ fuel-current-words ] if* natural-sort
     swap fuel-filter-prefix ;
 
+PRIVATE>
+
+: fuel-get-vocabs ( -- )
+    (fuel-get-vocabs) fuel-eval-set-result ;
+
+: fuel-get-vocabs/prefix ( prefix -- )
+    (fuel-get-vocabs) swap fuel-filter-prefix fuel-eval-set-result ;
+
 : fuel-get-words ( prefix names -- )
-    (fuel-get-words) fuel-eval-set-result ; inline
+    (fuel-get-words) fuel-eval-set-result ;
 
 ! Help support
 
-MEMO: fuel-articles-seq ( -- seq )
+: fuel-get-article ( name -- ) article fuel-eval-set-result ;
-    articles get values ;
 
-: fuel-find-articles ( title -- seq )
+MEMO: fuel-get-article-title ( name -- )
-    [ [ article-title ] dip = ] curry fuel-articles-seq swap filter ;
+    articles get at [ article-title ] [ f ] if* fuel-eval-set-result ;
 
-MEMO: fuel-find-article ( title -- article/f )
+: fuel-word-help ( name -- ) (fuel-word-help) fuel-eval-set-result ;
-    fuel-find-articles dup empty? [ drop f ] [ first ] if ;
 
-MEMO: fuel-article-title ( name -- title/f )
+: fuel-word-see ( name -- ) (fuel-word-see) fuel-eval-set-result ;
-    articles get at [ article-title ] [ f ] if* ;
 
-: fuel-get-article ( name -- )
+: fuel-vocab-help ( name -- ) (fuel-vocab-help) fuel-eval-set-result ;
-    article fuel-eval-set-result ;
 
-: fuel-value-str ( word -- str )
+: fuel-vocab-summary ( name -- )
-    [ pprint-short ] with-string-writer ; inline
+    (fuel-vocab-summary) fuel-eval-set-result ;
-
-: fuel-definition-str ( word -- str )
-    [ see ] with-string-writer ; inline
-
-: fuel-methods-str ( word -- str )
-    methods dup empty? not [
-        [ [ see nl ] each ] with-string-writer
-    ] [ drop f ] if ; inline
-
-: fuel-related-words ( word -- seq )
-    dup "related" word-prop remove ; inline
-
-: fuel-parent-topics ( word -- seq )
-    help-path [ dup article-title swap 2array ] map ; inline
-
-: (fuel-word-help) ( word -- element )
-    \ article swap dup article-title swap
-    [
-        {
-            [ fuel-parent-topics [ \ $doc-path prefix , ] unless-empty ]
-            [ \ $vocabulary swap vocabulary>> 2array , ]
-            [ word-help % ]
-            [ fuel-related-words [ \ $related swap 2array , ] unless-empty ]
-            [ get-global [ \ $value swap fuel-value-str 2array , ] when* ]
-            [ \ $definition swap fuel-definition-str 2array , ]
-            [ fuel-methods-str [ \ $methods swap 2array , ] when* ]
-        } cleave
-    ] { } make 3array ;
-
-MEMO: fuel-find-word ( name -- word/f )
-    [ [ name>> ] dip = ] curry all-words swap filter
-    dup empty? not [ first ] [ drop f ] if ;
-
-: fuel-word-help ( name -- )
-    fuel-find-word [ [ auto-use? on (fuel-word-help) ] with-scope ] [ f ] if*
-    fuel-eval-set-result ; inline
-
-: (fuel-word-see) ( word -- elem )
-    [ name>> \ article swap ]
-    [ [ see ] with-string-writer \ $code swap 2array ] bi 3array ; inline
-
-: fuel-word-see ( name -- )
-    fuel-find-word [ [ auto-use? on (fuel-word-see) ] with-scope ] [ f ] if*
-    fuel-eval-set-result ; inline
-
-: fuel-vocab-help-row ( vocab -- element )
-    [ vocab-status-string ] [ vocab-name ] [ summary ] tri 3array ;
-
-: fuel-vocab-help-root-heading ( root -- element )
-    [ "Children from " prepend ] [ "Other children" ] if* \ $heading swap 2array ;
-
-SYMBOL: vocab-list
-
-: fuel-vocab-help-table ( vocabs -- element )
-    [ fuel-vocab-help-row ] map vocab-list prefix ;
-
-: fuel-vocab-list ( assoc -- seq )
-    [
-        [ drop f ] [
-            [ fuel-vocab-help-root-heading ]
-            [ fuel-vocab-help-table ] bi*
-            [ 2array ] [ drop f ] if*
-        ] if-empty
-    ] { } assoc>map [  ] filter ;
-
-: fuel-vocab-children-help ( name -- element )
-    all-child-vocabs fuel-vocab-list ; inline
-
-: fuel-vocab-describe-words ( name -- element )
-    [ describe-words ] with-string-writer \ describe-words swap 2array ; inline
-
-: (fuel-vocab-help) ( name -- element )
-    dup require \ article swap dup >vocab-link
-    [
-        {
-            [ vocab-authors [ \ $authors prefix , ] when* ]
-            [ vocab-tags [ \ $tags prefix , ] when* ]
-            [ summary [ { $heading "Summary" } swap 2array , ] when* ]
-            [ drop \ $nl , ]
-            [ vocab-help [ article content>> % ] when* ]
-            [ name>> fuel-vocab-describe-words , ]
-            [ name>> fuel-vocab-children-help % ]
-        } cleave
-    ] { } make 3array ;
-
-: fuel-vocab-help ( name -- )
-    dup empty? [ fuel-vocab-children-help ] [ (fuel-vocab-help) ] if
-    fuel-eval-set-result ; inline
-
-: (fuel-index) ( seq -- seq )
-    [ [ >link name>> ] [ article-title ] bi 2array \ $subsection prefix ] map ;
-
-: fuel-index ( quot: ( -- seq ) -- )
-    call (fuel-index) fuel-eval-set-result ; inline
-
-MEMO: (fuel-get-vocabs/author) ( author -- element )
-    [ "Vocabularies by " prepend \ $heading swap 2array ]
-    [ authored fuel-vocab-list ] bi 2array ;
-
-: fuel-get-vocabs/author ( author -- )
-    (fuel-get-vocabs/author) fuel-eval-set-result ;
-
-MEMO: (fuel-get-vocabs/tag) ( tag -- element )
-    [ "Vocabularies tagged " prepend \ $heading swap 2array ]
-    [ tagged fuel-vocab-list ] bi 2array ;
 
 : fuel-get-vocabs/tag ( tag -- )
     (fuel-get-vocabs/tag) fuel-eval-set-result ;
 
+: fuel-get-vocabs/author ( author -- )
+    (fuel-get-vocabs/author) fuel-eval-set-result ;
+
 ! Scaffold support
 
 : fuel-scaffold-vocab ( root name devname -- )
@@ -378,9 +169,3 @@ MEMO: (fuel-get-vocabs/tag) ( tag -- element )
     developer-name set
     dup require dup scaffold-help vocab-docs-path
     (normalize-path) fuel-eval-set-result ;
-
-! -run=fuel support
-
-: fuel-startup ( -- ) "listener" run-file ; inline
-
-MAIN: fuel-startup

extra/fuel/help/authors.txt

@@ -0,0 +1 @@
+Jose Antonio Ortega Ruiz

extra/fuel/help/help-tests.factor

@@ -0,0 +1,4 @@
+! Copyright (C) 2009 Jose Antonio Ortega Ruiz.
+! See http://factorcode.org/license.txt for BSD license.
+USING: tools.test fuel.help ;
+IN: fuel.help.tests

extra/fuel/help/help.factor

@@ -0,0 +1,108 @@
+! Copyright (C) 2009 Jose Antonio Ortega Ruiz.
+! See http://factorcode.org/license.txt for BSD license.
+
+USING: accessors arrays assocs combinators help help.crossref
+help.markup help.topics io io.streams.string kernel make memoize
+namespaces parser prettyprint sequences summary tools.vocabs
+tools.vocabs.browser vocabs vocabs.loader words ;
+
+IN: fuel.help
+
+<PRIVATE
+
+MEMO: fuel-find-word ( name -- word/f )
+    [ [ name>> ] dip = ] curry all-words swap filter
+    dup empty? not [ first ] [ drop f ] if ;
+
+: fuel-value-str ( word -- str )
+    [ pprint-short ] with-string-writer ; inline
+
+: fuel-definition-str ( word -- str )
+    [ see ] with-string-writer ; inline
+
+: fuel-methods-str ( word -- str )
+    methods dup empty? not [
+        [ [ see nl ] each ] with-string-writer
+    ] [ drop f ] if ; inline
+
+: fuel-related-words ( word -- seq )
+    dup "related" word-prop remove ; inline
+
+: fuel-parent-topics ( word -- seq )
+    help-path [ dup article-title swap 2array ] map ; inline
+
+: (fuel-word-element) ( word -- element )
+    \ article swap dup article-title swap
+    [
+        {
+            [ fuel-parent-topics [ \ $doc-path prefix , ] unless-empty ]
+            [ \ $vocabulary swap vocabulary>> 2array , ]
+            [ word-help % ]
+            [ fuel-related-words [ \ $related swap 2array , ] unless-empty ]
+            [ get-global [ \ $value swap fuel-value-str 2array , ] when* ]
+            [ \ $definition swap fuel-definition-str 2array , ]
+            [ fuel-methods-str [ \ $methods swap 2array , ] when* ]
+        } cleave
+    ] { } make 3array ;
+
+: fuel-vocab-help-row ( vocab -- element )
+    [ vocab-status-string ] [ vocab-name ] [ summary ] tri 3array ;
+
+: fuel-vocab-help-root-heading ( root -- element )
+    [ "Children from " prepend ] [ "Other children" ] if* \ $heading swap 2array ;
+
+SYMBOL: vocab-list
+
+: fuel-vocab-help-table ( vocabs -- element )
+    [ fuel-vocab-help-row ] map vocab-list prefix ;
+
+: fuel-vocab-list ( assoc -- seq )
+    [
+        [ drop f ] [
+            [ fuel-vocab-help-root-heading ]
+            [ fuel-vocab-help-table ] bi*
+            [ 2array ] [ drop f ] if*
+        ] if-empty
+    ] { } assoc>map [  ] filter ;
+
+: fuel-vocab-children-help ( name -- element )
+    all-child-vocabs fuel-vocab-list ; inline
+
+: fuel-vocab-describe-words ( name -- element )
+    [ describe-words ] with-string-writer \ describe-words swap 2array ; inline
+
+: (fuel-vocab-element) ( name -- element )
+    dup require \ article swap dup >vocab-link
+    [
+        {
+            [ vocab-authors [ \ $authors prefix , ] when* ]
+            [ vocab-tags [ \ $tags prefix , ] when* ]
+            [ summary [ { $heading "Summary" } swap 2array , ] when* ]
+            [ drop \ $nl , ]
+            [ vocab-help [ article content>> % ] when* ]
+            [ name>> fuel-vocab-describe-words , ]
+            [ name>> fuel-vocab-children-help % ]
+        } cleave
+    ] { } make 3array ;
+
+PRIVATE>
+
+: (fuel-word-help) ( object -- object )
+    fuel-find-word [ [ auto-use? on (fuel-word-element) ] with-scope ] [ f ] if* ;
+
+: (fuel-word-see) ( word -- elem )
+    [ name>> \ article swap ]
+    [ [ see ] with-string-writer \ $code swap 2array ] bi 3array ; inline
+
+: (fuel-vocab-summary) ( name -- str ) >vocab-link summary ; inline
+
+: (fuel-vocab-help) ( name -- str )
+    dup empty? [ fuel-vocab-children-help ] [ (fuel-vocab-element) ] if ;
+
+MEMO: (fuel-get-vocabs/author) ( author -- element )
+    [ "Vocabularies by " prepend \ $heading swap 2array ]
+    [ authored fuel-vocab-list ] bi 2array ;
+
+MEMO: (fuel-get-vocabs/tag) ( tag -- element )
+    [ "Vocabularies tagged " prepend \ $heading swap 2array ]
+    [ tagged fuel-vocab-list ] bi 2array ;

extra/fuel/pprint/authors.txt

@@ -0,0 +1 @@
+Jose Antonio Ortega Ruiz

extra/fuel/pprint/pprint-tests.factor

@@ -0,0 +1,4 @@
+! Copyright (C) 2009 Jose Antonio Ortega Ruiz.
+! See http://factorcode.org/license.txt for BSD license.
+USING: tools.test fuel.pprint ;
+IN: fuel.pprint.tests

extra/fuel/pprint/pprint.factor

@@ -0,0 +1,63 @@
+! Copyright (C) 2009 Jose Antonio Ortega Ruiz.
+! See http://factorcode.org/license.txt for BSD license.
+
+USING: accessors arrays classes.tuple combinators continuations io
+kernel lexer math prettyprint quotations sequences source-files
+strings words ;
+
+IN: fuel.pprint
+
+GENERIC: fuel-pprint ( obj -- )
+
+<PRIVATE
+
+: fuel-maybe-scape ( ch -- seq )
+    dup "\\\"?#()[]'`" member? [ CHAR: \ swap 2array ] [ 1array ] if ;
+
+SYMBOL: :restarts
+
+: fuel-restarts ( obj -- seq )
+    compute-restarts :restarts prefix ; inline
+
+: fuel-pprint-sequence ( seq open close -- )
+    [ write ] dip swap [ " " write ] [ fuel-pprint ] interleave write ; inline
+
+PRIVATE>
+
+M: object fuel-pprint pprint ; inline
+
+M: word fuel-pprint
+    name>> V{ } clone [ fuel-maybe-scape append ] reduce >string write ;
+
+M: f fuel-pprint drop "nil" write ; inline
+
+M: integer fuel-pprint pprint ; inline
+
+M: string fuel-pprint pprint ; inline
+
+M: sequence fuel-pprint "(" ")" fuel-pprint-sequence ; inline
+
+M: quotation fuel-pprint "[" "]" fuel-pprint-sequence ; inline
+
+M: tuple fuel-pprint tuple>array fuel-pprint ; inline
+
+M: continuation fuel-pprint drop ":continuation" write ; inline
+
+M: restart fuel-pprint name>> fuel-pprint ; inline
+
+M: condition fuel-pprint
+    [ error>> ] [ fuel-restarts ] bi 2array condition prefix fuel-pprint ;
+
+M: lexer-error fuel-pprint
+    {
+        [ line>> ]
+        [ column>> ]
+        [ line-text>> ]
+        [ fuel-restarts ]
+    } cleave 4array lexer-error prefix fuel-pprint ;
+
+M: source-file-error fuel-pprint
+    [ file>> ] [ error>> ] bi 2array source-file-error prefix
+    fuel-pprint ;
+
+M: source-file fuel-pprint path>> fuel-pprint ;

misc/fuel/fuel-connection.el

@@ -160,7 +160,7 @@
     (fuel-con--send-string/wait buffer
                                 fuel-con--init-stanza
                                 'fuel-con--establish-connection-cont
-                                20000)
+                                60000)
     conn))
 
 (defun fuel-con--establish-connection-cont (ignore)

misc/fuel/fuel-listener.el

@@ -73,7 +73,7 @@ buffer."
       (error "Could not run factor: %s is not executable" factor))
     (unless (file-readable-p image)
       (error "Could not run factor: image file %s not readable" image))
-    (message "Starting FUEL listener ...")
+    (message "Starting FUEL listener (this may take a while) ...")
     (pop-to-buffer (fuel-listener--buffer))
     (make-comint-in-buffer "fuel listener" (current-buffer) factor nil
                            "-run=listener" (format "-i=%s" image))

misc/fuel/fuel-markup.el

@@ -71,7 +71,7 @@
 
 (defun fuel-markup--article-title (name)
   (fuel-eval--retort-result
-   (fuel-eval--send/wait `(:fuel* ((,name fuel-article-title :get)) "fuel"))))
+   (fuel-eval--send/wait `(:fuel* ((,name fuel-get-article-title)) "fuel"))))
 
 (defun fuel-markup--link-at-point ()
   (let ((button (condition-case nil (forward-button 0) (error nil))))