vocabs: support qualified lookups in no-word restarts.

2016-03-29 12:37:24 -07:00 · 2016-03-29 12:37:24 -07:00 · 7aa0e16df8
parent 3f803e3893
commit 7aa0e16df8
1 changed files with 6 additions and 3 deletions
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@ -100,9 +100,12 @@ ERROR: no-vocab name ;
    dictionary get values [ vocab-words ] map concat ;

 : words-named ( str -- seq )
-    dictionary get values
-    [ vocab-words-assoc at ] with map
-    sift ;
+    dictionary get
+    [ values [ vocab-words-assoc at ] with map sift ]
+    [
+        [ ":" split1 swap ] dip at
+        [ vocab-words-assoc at suffix ] [ drop ] if*
+    ] 2bi ;

 : child-vocab? ( prefix name -- ? )
    swap [ drop t ] [