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

tools.scaffold: use vocabs:check-vocab-name.

db4
John Benediktsson 2015-07-09 11:02:09 -07:00
parent afb055470a
commit 8dd67e0741
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/tools/scaffold/scaffold.factor
View File

@ -14,8 +14,6 @@ SYMBOL: developer-name
SYMBOL: using SYMBOL: using
ERROR: not-a-vocab-root string ; ERROR: not-a-vocab-root string ;
ERROR: vocab-name-contains-separator path ;
ERROR: vocab-name-contains-dot path ;
<PRIVATE <PRIVATE
@ -30,11 +28,6 @@ ERROR: vocab-name-contains-dot path ;
: ensure-vocab-exists ( string -- string ) : ensure-vocab-exists ( string -- string )
dup loaded-vocab-names member? [ no-vocab ] unless ; dup loaded-vocab-names member? [ no-vocab ] unless ;
: check-vocab-name ( string -- string )
[ ]
[ contains-dot? [ vocab-name-contains-dot ] when ]
[ contains-separator? [ vocab-name-contains-separator ] when ] tri ;
: check-root ( string -- string ) : check-root ( string -- string )
dup vocab-root? [ not-a-vocab-root ] unless ; dup vocab-root? [ not-a-vocab-root ] unless ;
@ -289,7 +282,7 @@ PRIVATE>
[ "platforms.txt" ] dip scaffold-metadata ; [ "platforms.txt" ] dip scaffold-metadata ;
: scaffold-vocab ( vocab-root string -- ) : scaffold-vocab ( vocab-root string -- )
check-vocab-name { {
[ scaffold-directory ] [ scaffold-directory ]
[ scaffold-main ] [ scaffold-main ]
[ nip require ] [ nip require ]