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

ui.tools.listener.completion: fix complete-vocab? check (also its faster now).

db4
John Benediktsson 2012-07-26 18:57:40 -07:00
parent cfdbf02a9a
commit 4b7d7aed1c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/ui/tools/listener/completion/completion-tests.factor
View File

@ -5,8 +5,12 @@ IN: ui.tools.listener.completion.tests
[ f ] [ { "USE:" "A" "B" "C" } complete-vocab? ] unit-test
[ f ] [ { "USE:" "A" "B" } complete-vocab? ] unit-test
[ t ] [ { "USE:" "A" } complete-vocab? ] unit-test
[ t ] [ { "USE:" } complete-vocab? ] unit-test
[ t ] [ { "UNUSE:" "A" } complete-vocab? ] unit-test
[ t ] [ { "QUALIFIED:" "A" } complete-vocab? ] unit-test
@ -17,4 +21,4 @@ IN: ui.tools.listener.completion.tests
[ f ] [ { "USING:" "A" "B" "C" ";" } complete-vocab-list? ] unit-test
[ t ] [ { "X" ";" "USING:" "A" "B" "C" } complete-vocab-list? ] unit-test
[ t ] [ { "X" ";" "USING:" "A" "B" "C" } complete-vocab-list? ] unit-test

8
basis/ui/tools/listener/completion/completion.factor
View File

@ -76,8 +76,12 @@ M: vocab-completion row-color
drop vocab? COLOR: black COLOR: dark-gray ? ;
: complete-vocab? ( tokens -- ? )
1 short head* 2 short tail*
{ "IN:" "USE:" "UNUSE:" "QUALIFIED:" "QUALIFIED-WITH:" } intersects? ;
harvest 2 short tail* [ f ] [
[
{ "IN:" "USE:" "UNUSE:" "QUALIFIED:" "QUALIFIED-WITH:" }
member?
] any?
] if-empty ;
: chop-; ( seq -- seq' )
{ ";" } split1-last [ ] [ ] ?if ;