factor: trim using lists

[factor.git] / extra / modern / paths / paths.factor

diff --git a/extra/modern/paths/paths.factor b/extra/modern/paths/paths.factor
index d8f896e471f47ea76b4c9dffc8932ec7cb1d6148..2b54684760adb3fa9846bbaa6f7a84e247f71ccd 100644 (file)
--- a/extra/modern/paths/paths.factor
+++ b/extra/modern/paths/paths.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2015 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators.smart io.files kernel sequences
-splitting vocabs.files vocabs.hierarchy vocabs.loader
-vocabs.metadata sets ;
+USING: accessors combinators.smart io.files sequences sets
+vocabs.files vocabs.hierarchy vocabs.loader ;
 IN: modern.paths
 
 ERROR: not-a-source-path path ;
@@ -11,9 +10,8 @@ ERROR: not-a-source-path path ;
     "" disk-vocabs-in-root/prefix
     no-prefixes [ name>> ] map ;
 
-: core-vocabs ( -- seq ) "resource:core" vocabs-from ;
-: less-core-test-vocabs ( seq -- seq' )
-    {
+CONSTANT: core-broken-vocabs
+   {
         "vocabs.loader.test.a"
         "vocabs.loader.test.b"
         "vocabs.loader.test.c"
@@ -30,10 +28,10 @@ ERROR: not-a-source-path path ;
         "vocabs.loader.test.n"
         "vocabs.loader.test.o"
         "vocabs.loader.test.p"
-    } diff ;
+    }
 
-: core-bootstrap-vocabs ( -- seq )
-    core-vocabs less-core-test-vocabs ;
+: core-vocabs ( -- seq )
+    "resource:core" vocabs-from core-broken-vocabs diff ;
 
 : basis-vocabs ( -- seq ) "resource:basis" vocabs-from ;
 : extra-vocabs ( -- seq ) "resource:extra" vocabs-from ;
@@ -44,7 +42,7 @@ ERROR: not-a-source-path path ;
         extra-vocabs
     ] { } append-outputs-as ;
 
-: filter-exists ( seq -- seq' ) [ exists? ] filter ;
+: filter-exists ( seq -- seq' ) [ file-exists? ] filter ;
 
 ! These paths have syntax errors on purpose...
 : reject-some-paths ( seq -- seq' )