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

tools.completion: fix CHAR: and COLOR: completion to require extra tokens.

db4
John Benediktsson 2012-10-22 18:29:53 -07:00
parent 65678aeeb2
commit 3049d187f6
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
basis/tools/completion/completion-tests.factor
View File

@ -30,3 +30,6 @@ IN: tools.completion
{ f } [ { "USING:" "A" "B" "C" ";" } complete-vocab? ] unit-test { f } [ { "USING:" "A" "B" "C" ";" } complete-vocab? ] unit-test
{ t } [ { "X" ";" "USING:" "A" "B" "C" } complete-vocab? ] unit-test { t } [ { "X" ";" "USING:" "A" "B" "C" } complete-vocab? ] unit-test
{ f } [ { "CHAR:" } complete-CHAR:? ] unit-test
{ t } [ { "CHAR:" "" } complete-CHAR:? ] unit-test
{ t } [ { "CHAR:" "a" } complete-CHAR:? ] unit-test

18
basis/tools/completion/completion.factor
View File

@ -135,8 +135,18 @@ PRIVATE>
: complete-vocab? ( tokens -- ? ) : complete-vocab? ( tokens -- ? )
{ [ complete-single-vocab? ] [ complete-vocab-list? ] } 1|| ; { [ complete-single-vocab? ] [ complete-vocab-list? ] } 1|| ;
: complete-CHAR:? ( tokens -- ? ) <PRIVATE
2 short tail* "CHAR:" swap member? ;
: complete-COLOR:? ( tokens -- ? ) : complete-token? ( tokens token -- ? )
2 short tail* "COLOR:" swap member? ; over last empty? [
[ harvest ?last ] [ = ] bi*
] [
swap harvest dup length 1 >
[ 2 tail* ?first = ] [ 2drop f ] if
] if ;
PRIVATE>
: complete-CHAR:? ( tokens -- ? ) "CHAR:" complete-token? ;
: complete-COLOR:? ( tokens -- ? ) "COLOR:" complete-token? ;