steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

elevate-erg
Doug Coleman 2018-07-04 19:05:37 -05:00
parent afd60c1d3b
commit e01d1133be
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/modern/modern.factor
View File

@ -487,7 +487,7 @@ ERROR: compound-syntax-disallowed n seq obj ;
: failed-lexing ( assoc -- assoc' ) [ nip array? ] assoc-reject ; : 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-basis ( -- assoc ) basis-vocabs lex-vocabs ;
: lex-extra ( -- assoc ) extra-vocabs lex-vocabs ; : lex-extra ( -- assoc ) extra-vocabs lex-vocabs ;
: lex-roots ( -- assoc ) lex-core lex-basis lex-extra 3append ; : lex-roots ( -- assoc ) lex-core lex-basis lex-extra 3append ;

9
extra/modern/paths/paths.factor
View File

@ -11,8 +11,7 @@ ERROR: not-a-source-path path ;
"" disk-vocabs-in-root/prefix "" disk-vocabs-in-root/prefix
no-prefixes [ name>> ] map ; no-prefixes [ name>> ] map ;
: core-vocabs ( -- seq ) "resource:core" vocabs-from ; CONSTANT: core-broken-vocabs
: less-core-test-vocabs ( seq -- seq' )
{ {
"vocabs.loader.test.a" "vocabs.loader.test.a"
"vocabs.loader.test.b" "vocabs.loader.test.b"
@ -30,10 +29,10 @@ ERROR: not-a-source-path path ;
"vocabs.loader.test.n" "vocabs.loader.test.n"
"vocabs.loader.test.o" "vocabs.loader.test.o"
"vocabs.loader.test.p" "vocabs.loader.test.p"
} diff ; }
: core-bootstrap-vocabs ( -- seq ) : core-vocabs ( -- seq )
core-vocabs less-core-test-vocabs ; "resource:core" vocabs-from core-broken-vocabs diff ;
: basis-vocabs ( -- seq ) "resource:basis" vocabs-from ; : basis-vocabs ( -- seq ) "resource:basis" vocabs-from ;
: extra-vocabs ( -- seq ) "resource:extra" vocabs-from ; : extra-vocabs ( -- seq ) "resource:extra" vocabs-from ;