vocabs: reverting recent private vocab changes.

db4
John Benediktsson 2012-08-13 10:32:14 -07:00
parent ea25cde2af
commit e374f2fa19
4 changed files with 8 additions and 17 deletions

View File

@ -38,12 +38,7 @@ ERROR: vocab-root-required root ;
: (child-vocabs) ( root prefix -- vocabs )
check-vocab-name
[
dup ".private" tail? [ 2drop { } ] [
vocab-dir append-path dup exists?
[ vocab-subdirs ] [ drop { } ] if
] if
]
[ vocab-dir append-path dup exists? [ vocab-subdirs ] [ drop { } ] if ]
[ nip [ "." append '[ _ prepend ] map! ] unless-empty ]
[ drop '[ _ over vocab-dir? [ >vocab-link ] [ <vocab-prefix> ] if ] map! ]
2tri ;

View File

@ -192,6 +192,3 @@ forget-junk
[
"mnop" [ "vocabs.loader.test." swap suffix forget-vocab ] each
] with-compilation-unit
{ "math" } [ "math.private" vocab-dir ] unit-test
{ "resource:core/math/math-docs.factor" } [ "math.private" vocab-docs-path ] unit-test

View File

@ -42,10 +42,10 @@ M: string vocab-path ( string -- path/f )
PRIVATE>
: vocab-dir ( vocab -- dir )
vocab-name* H{ { CHAR: . CHAR: / } } substitute ;
vocab-name H{ { CHAR: . CHAR: / } } substitute ;
: append-vocab-dir ( vocab str/f -- path )
[ vocab-name* "." split ] dip
[ vocab-name "." split ] dip
[ [ dup last ] dip append suffix ] when*
"/" join ;
@ -89,9 +89,7 @@ require-when-table [ V{ } clone ] initialize
dup check-vocab-hook get call( vocab -- )
[
+parsing+ >>source-loaded?
dup vocab-name ".private" tail? [ [ ] ] [
dup vocab-source-path [ parse-file ] [ [ ] ] if*
] if
dup vocab-source-path [ parse-file ] [ [ ] ] if*
[ +parsing+ >>source-loaded? ] dip
[ % ] [ call( -- ) ] if-bootstrapping
+done+ >>source-loaded?
@ -102,9 +100,7 @@ require-when-table [ V{ } clone ] initialize
load-help? get [
[
+parsing+ >>docs-loaded?
dup vocab-name ".private" tail? [
dup vocab-docs-path [ ?run-file ] when*
] unless
dup vocab-docs-path [ ?run-file ] when*
+done+ >>docs-loaded?
] [ ] [ f >>docs-loaded? ] cleanup
] when drop ;

View File

@ -44,6 +44,9 @@ M: object vocab-name check-vocab-name ;
: vocab-name* ( vocab-spec -- name )
vocab-name ".private" ?tail drop ;
: private-vocab? ( vocab -- ? )
vocab-name ".private" tail? ;
GENERIC: lookup-vocab ( vocab-spec -- vocab )
M: vocab lookup-vocab ;