Fix locals conflict

[factor.git] / basis / locals / locals.factor

diff --git a/basis/locals/locals.factor b/basis/locals/locals.factor
index 494c72bc03b7eb0fc753930ebff53803787a11cf..20602224723af67832a19eb292ab8ae7ad142cd5 100644 (file)
--- a/basis/locals/locals.factor
+++ b/basis/locals/locals.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov, Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: lexer locals.parser locals.types macros memoize parser
-sequences vocabs.loader words ;
+sequences vocabs vocabs.loader words kernel ;
 IN: locals
 
 : :> scan <local> <def> parsed ; parsing
@@ -29,8 +29,11 @@ IN: locals
 : MEMO:: (::) define-memoized ; parsing
 
 {
-    "locals.prettyprint"
-    "locals.definitions"
     "locals.macros"
     "locals.fry"
 } [ require ] each
+
+"prettyprint" vocab [
+    "locals.definitions" require
+    "locals.prettyprint" require
+] when