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

vocabs: simplify M\ string require.

char-rename
John Benediktsson 2017-02-09 16:24:05 -08:00
parent 2e73914e85
commit 9d3b5cb44b
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/vocabs/vocabs.factor
View File

@ -139,28 +139,20 @@ PREDICATE: runnable-vocab < vocab
INSTANCE: vocab-spec definition-mixin
: call-require-hook ( name -- )
require-hook get call( name -- ) ;
GENERIC: require ( object -- )
M: vocab require name>> require ;
M: vocab-link require name>> require ;
! When calling "foo.private" require, load "foo" instead, but only when
! "foo.private" does not exist. The reason for this is that stage1 bootstrap
! starts out with some .private vocabs that contain primitives, and
! loading the public vocabs would cause circularity issues.
M: string require ( vocab -- )
dup ".private" ?tail [
over lookup-vocab
[ 2drop ]
[ nip call-require-hook ]
if
] [
nip call-require-hook
] if ;
! When calling "foo.private" require, load "foo" instead, but
! only when "foo.private" does not exist. The reason for this is
! that stage1 bootstrap starts out with some .private vocabs
! that contain primitives, and loading the public vocabs would
! cause circularity issues.
M: string require
[ ".private" ?tail ] keep swap [ lookup-vocab not ] when
[ require-hook get call( name -- ) ] [ drop ] if ;
: load-vocab ( name -- vocab )
[ require ] [ lookup-vocab ] bi ;