steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

help: change how default word help is done.

locals-and-roots
John Benediktsson 2016-05-26 16:51:16 -07:00
parent 21461a1b75
commit e38caddb30
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
basis/help/help.factor
View File

@ -8,12 +8,30 @@ namespaces prettyprint sequences sets sorting vocabs words
words.symbol ; words.symbol ;
IN: help IN: help
<PRIVATE
: default-word-help ( word -- elements )
stack-effect [ in>> ] [ out>> ] bi [
[
dup pair? [
first2 dup effect? [ \ $quotation swap 2array ] when
] [
object
] if [ effect>string ] dip
] { } map>assoc
] bi@ append members \ $values prefix 1array ;
PRIVATE>
GENERIC: word-help* ( word -- content ) GENERIC: word-help* ( word -- content )
: word-help ( word -- content ) : word-help ( word -- content )
dup "help" word-prop [ ] [ dup "help" word-prop [ ] [
dup word-help* dup dup word-help* dup [
[ swap 2array 1array ] [ 2drop f ] if swap 2array 1array
] [
drop dup class? [ drop f ] [ default-word-help ] if
] if
] ?if ; ] ?if ;
: $predicate ( element -- ) : $predicate ( element -- )
@ -24,20 +42,7 @@ GENERIC: word-help* ( word -- content )
" class." , " class." ,
] { } make $description ; ] { } make $description ;
: $default ( element -- ) M: word word-help* drop f ;
first stack-effect [ in>> ] [ out>> ] bi [
[
dup pair? [
first2 dup effect? [ \ $quotation swap 2array ] when
] [
object
] if [ effect>string ] dip
] { } map>assoc
] bi@ append members $values ;
M: word word-help* drop \ $default ;
M: class word-help* drop f ;
M: predicate word-help* drop \ $predicate ; M: predicate word-help* drop \ $predicate ;