vocabs.parser: make a with-words combinator that cleans up.

Some places where we use-words / unuse-words could leave the manifest
with extra-words if not cleaned up properly.

diff --git a/core/vocabs/parser/parser.factor b/core/vocabs/parser/parser.factor
index 7993e10c21bdaf644a4d06bf6c68208b0531be61..2cbd038c358e6461bc51a164559ef2af507fbb32 100644 (file)
--- a/core/vocabs/parser/parser.factor
+++ b/core/vocabs/parser/parser.factor
@@ -175,6 +175,9 @@ TUPLE: rename word vocab words ;
 : unuse-words ( assoc -- )
     <extra-words> qualified-vocabs remove! drop ;
 
+: with-words ( assoc quot -- )
+    [ use-words ] prepose [ ] pick '[ _ unuse-words ] cleanup ; inline
+
 TUPLE: ambiguous-use-error name words ;
 
 : <ambiguous-use-error> ( name words -- error restarts )