] if ;
: reload ( name -- )
- dup lookup-vocab
- [ [ load-source ] [ load-docs ] bi ]
- [ require ]
- ?if ;
+ dup lookup-vocab [
+ f >>source-loaded? f >>docs-loaded? drop
+ ] when* require ;
: run ( vocab -- )
dup load-vocab vocab-main [
"To define one, refer to \\ MAIN: help" print
] ?if ;
-SYMBOL: errorlist
-
<PRIVATE
-: add-to-errorlist ( error vocab -- )
- vocab-name errorlist get [ set-at ] [ 2drop ] if* ;
-
-: remove-from-errorlist ( vocab -- )
- vocab-name errorlist get [ delete-at ] [ drop ] if* ;
-
GENERIC: (require) ( name -- )
M: vocab (require)
- [
- [
- dup source-loaded?>> +parsing+ eq? [ drop ] [
- dup source-loaded?>> [ dup load-source ] unless
- dup docs-loaded?>> [ dup load-docs ] unless
- drop
- ] if
- ] [
- remove-from-errorlist
- ] bi
- ] [ [ swap add-to-errorlist ] keep rethrow ] recover ;
+ dup source-loaded?>> +parsing+ eq? [
+ dup source-loaded?>> [ dup load-source ] unless
+ dup docs-loaded?>> [ dup load-docs ] unless
+ ] unless drop ;
M: vocab-link (require)
vocab-name (require) ;
PRIVATE>
-: require-all ( vocabs -- )
- V{ } clone errorlist [ [ require ] each ] with-variable ;
-
[
- dup vocab-name errorlist get at*
- [ rethrow ]
- [
- drop dup find-vocab-root
- [ (require) ]
- [ dup lookup-vocab [ drop ] [ no-vocab ] if ]
- if
- ] if
+ dup find-vocab-root
+ [ (require) ]
+ [ dup lookup-vocab [ drop ] [ no-vocab ] if ]
+ if
] require-hook set-global
M: vocab-spec where vocab-source-path dup [ 1 2array ] when ;
! Copyright (C) 2007, 2009 Eduardo Cavazos, Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs definitions kernel namespaces
-sequences sorting splitting strings ;
+USING: accessors arrays assocs definitions kernel namespaces
+sequences sets sorting splitting strings ;
IN: vocabs
SYMBOL: dictionary
main help
source-loaded? docs-loaded? ;
-! sources-loaded? slot is one of these three
-SYMBOL: +parsing+
-SYMBOL: +running+
-SYMBOL: +done+
+! sources-loaded? and docs-loaded? slots could be
+SYMBOLS: +parsing+ +done+ ;
: <vocab> ( name -- vocab )
vocab new
UNION: vocab-spec vocab vocab-link ;
+INSTANCE: vocab-spec definition-mixin
+
GENERIC: vocab-name ( vocab-spec -- name )
M: vocab vocab-name name>> ;
M: f vocab-main ;
+PREDICATE: runnable-vocab < vocab
+ vocab-main >boolean ;
+
SYMBOL: vocab-observers
GENERIC: vocab-changed ( vocab obj -- )
SYMBOL: require-hook
-PREDICATE: runnable-vocab < vocab
- vocab-main >boolean ;
+<PRIVATE
-INSTANCE: vocab-spec definition-mixin
+SYMBOL: requiring
+
+: with-requiring ( quot -- )
+ requiring get [
+ call
+ ] [
+ HS{ } clone requiring [ call ] with-variable
+ ] if ; inline
+
+PRIVATE>
GENERIC: require ( object -- )
! 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 ;
+ [ ".private" ?tail ] keep swap [ lookup-vocab not ] when [
+ [
+ dup requiring get ?adjoin
+ [ require-hook get call( name -- ) ] [ drop ] if
+ ] with-requiring
+ ] [ drop ] if ;
+
+: require-all ( vocabs -- )
+ [ [ require ] each ] with-requiring ;
: load-vocab ( name -- vocab )
[ require ] [ lookup-vocab ] bi ;