basis: fewer tokens when possible using if*.
parent
244fca37a9
commit
1754ab73bd
|
@ -99,12 +99,12 @@ M: conversations call-responder*
|
|||
<redirect> ;
|
||||
|
||||
: restore-conversation ( seq -- )
|
||||
conversation get dup [
|
||||
conversation get [
|
||||
namespace>>
|
||||
[ '[ _ key? ] filter ]
|
||||
[ '[ [ _ at ] keep set ] each ]
|
||||
bi
|
||||
] [ 2drop ] if ;
|
||||
] [ drop ] if* ;
|
||||
|
||||
M: conversations modify-form ( conversations -- xml/f )
|
||||
drop
|
||||
|
|
|
@ -58,8 +58,8 @@ SYMBOL: generic-dependencies
|
|||
[ class-or ] when* ;
|
||||
|
||||
: add-depends-on-generic ( class generic -- )
|
||||
generic-dependencies get dup
|
||||
[ [ ?class-or ] change-at ] [ 3drop ] if ;
|
||||
generic-dependencies get
|
||||
[ [ ?class-or ] change-at ] [ 2drop ] if* ;
|
||||
|
||||
! Conditional dependencies are re-evaluated when classes change;
|
||||
! if any fail, the word is recompiled
|
||||
|
@ -69,7 +69,7 @@ GENERIC: satisfied? ( dependency -- ? )
|
|||
|
||||
: add-conditional-dependency ( ... class -- )
|
||||
boa conditional-dependencies get
|
||||
dup [ adjoin ] [ 2drop ] if ; inline
|
||||
[ adjoin ] [ drop ] if* ; inline
|
||||
|
||||
TUPLE: depends-on-class-predicate class1 class2 result ;
|
||||
|
||||
|
|
|
@ -20,10 +20,10 @@ exclude-vocabs { "math" "accessors" } swap set-global
|
|||
SYMBOL: end
|
||||
|
||||
: include? ( vocab -- ? )
|
||||
include-vocabs get dup [ member? ] [ 2drop t ] if ;
|
||||
include-vocabs get [ member? ] [ drop t ] if* ;
|
||||
|
||||
: exclude? ( vocab -- ? )
|
||||
exclude-vocabs get dup [ member? ] [ 2drop f ] if ;
|
||||
exclude-vocabs get [ member? ] [ drop f ] if* ;
|
||||
|
||||
: into? ( obj -- ? )
|
||||
{
|
||||
|
|
|
@ -32,7 +32,7 @@ SYMBOL: changed-vocabs
|
|||
[ unchanged-vocab ] each ;
|
||||
|
||||
: changed-vocab? ( vocab -- ? )
|
||||
changed-vocabs get dup [ key? ] [ 2drop t ] if ;
|
||||
changed-vocabs get [ key? ] [ drop t ] if* ;
|
||||
|
||||
: filter-changed ( vocabs -- vocabs' )
|
||||
[ changed-vocab? ] filter ;
|
||||
|
|
Loading…
Reference in New Issue