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

vocabs.parser: faster name lookup.

master
John Benediktsson 2020-08-14 11:58:50 -07:00
parent 8cc090950a
commit d535b62f50
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/vocabs/parser/parser.factor
View File

@ -182,17 +182,24 @@ TUPLE: ambiguous-use-error name words ;
<PRIVATE <PRIVATE
: (vocab-search) ( name assocs -- words ) : (lookup-word) ( words name vocab -- words )
[ words>> (lookup) ] with map sift ; words>> (lookup) [ suffix! ] when* ; inline
: (vocab-search-qualified) ( name assocs -- words ) : (vocab-search) ( name assocs -- words )
[ ":" split1 swap ] dip [ name>> = ] with filter (vocab-search) ; [ V{ } clone ] 2dip [ (lookup-word) ] with each ;
: (vocab-search-qualified) ( words name assocs -- words )
[ ":" split1 swap ] dip pick [
[ name>> = ] with find nip [ (lookup-word) ] with when*
] [
3drop
] if ;
: (vocab-search-full) ( name assocs -- words ) : (vocab-search-full) ( name assocs -- words )
[ (vocab-search-qualified) ] [ (vocab-search) ] 2bi append ; [ (vocab-search) ] [ (vocab-search-qualified) ] 2bi ;
: vocab-search ( name manifest -- word/f ) : vocab-search ( name manifest -- word/f )
dupd search-vocabs>> sift (vocab-search-full) dup length { dupd search-vocabs>> (vocab-search-full) dup length {
{ 0 [ 2drop f ] } { 0 [ 2drop f ] }
{ 1 [ first nip ] } { 1 [ first nip ] }
[ [