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

tools.scaffold: quick fix for scaffold-vocab bug. 

root-cache was getting added to with ``f`` and then subsequent check fails.
paths
John Benediktsson 2018-06-15 15:51:02 -07:00
parent 042bbccd1a
commit b854217796
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ ERROR: vocab-must-not-exist string ;
trim-tail-separators vocab-roots get member? ; trim-tail-separators vocab-roots get member? ;
: ensure-vocab-exists ( string -- string ) : ensure-vocab-exists ( string -- string )
dup loaded-vocab-names member? [ no-vocab ] unless ; dup lookup-vocab [ no-vocab ] unless ;
: check-root ( string -- string ) : check-root ( string -- string )
dup vocab-root? [ not-a-vocab-root ] unless ; dup vocab-root? [ not-a-vocab-root ] unless ;
@ -31,10 +31,11 @@ ERROR: vocab-must-not-exist string ;
[ check-root ] [ check-vocab-name ] bi* ; [ check-root ] [ check-vocab-name ] bi* ;
: check-vocab-exists ( string -- string ) : check-vocab-exists ( string -- string )
dup vocab-exists? [ vocab-must-not-exist ] when ; dup vocab-exists? [ vocab-must-not-exist ] when
dup root-cache get delete-at ;
: replace-vocab-separators ( vocab -- path ) : replace-vocab-separators ( vocab -- path )
path-separator first CHAR: . associate substitute ; inline path-separator first CHAR: . associate substitute ;
: vocab-root/vocab>path ( vocab-root vocab -- path ) : vocab-root/vocab>path ( vocab-root vocab -- path )
check-vocab-root/vocab check-vocab-root/vocab