modern: core-vocabs should not return the broken test vocabs.

diff --git a/extra/modern/modern.factor b/extra/modern/modern.factor
index 63f2645eda49e52a1ae6e73548925ec67f2068c7..e949a387e1e10825e596038cd142c59a2ed3fdde 100644 (file)
--- a/extra/modern/modern.factor
+++ b/extra/modern/modern.factor
@@ -487,7 +487,7 @@ ERROR: compound-syntax-disallowed n seq obj ;
 
 : failed-lexing ( assoc -- assoc' ) [ nip array? ] assoc-reject ;
 
-: lex-core ( -- assoc ) core-bootstrap-vocabs lex-vocabs ;
+: lex-core ( -- assoc ) core-vocabs lex-vocabs ;
 : lex-basis ( -- assoc ) basis-vocabs lex-vocabs ;
 : lex-extra ( -- assoc ) extra-vocabs lex-vocabs ;
 : lex-roots ( -- assoc ) lex-core lex-basis lex-extra 3append ;

diff --git a/extra/modern/paths/paths.factor b/extra/modern/paths/paths.factor
index d8f896e471f47ea76b4c9dffc8932ec7cb1d6148..a6e46ebde0e92b6c954b0454c6f0bd70042b7988 100644 (file)
--- a/extra/modern/paths/paths.factor
+++ b/extra/modern/paths/paths.factor
@@ -11,9 +11,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 +29,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 ;