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

tools.scaffold: remove unused contains-dot?, contains-separator?.

factor-shell
John Benediktsson 2018-01-22 11:37:24 -08:00
parent ea66922b91
commit 2b31e95270
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,7 @@ ERROR: not-a-vocab-root string ;
<PRIVATE <PRIVATE
: vocab-root? ( string -- ? ) : vocab-root? ( string -- ? )
trim-tail-separators trim-tail-separators vocab-roots get member? ;
vocab-roots get member? ;
: contains-dot? ( string -- ? ) ".." swap subseq? ;
: contains-separator? ( string -- ? ) [ path-separator? ] any? ;
: 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 ;
@ -41,8 +36,7 @@ ERROR: not-a-vocab-root string ;
[ ] [ replace-vocab-separators ] bi* append-path ; [ ] [ replace-vocab-separators ] bi* append-path ;
: vocab>path ( vocab -- path ) : vocab>path ( vocab -- path )
check-vocab check-vocab [ find-vocab-root ] keep vocab-root/vocab>path ;
[ find-vocab-root ] keep vocab-root/vocab>path ;
: vocab-root/vocab/file>path ( vocab-root vocab file -- path ) : vocab-root/vocab/file>path ( vocab-root vocab file -- path )
[ vocab-root/vocab>path ] dip append-path ; [ vocab-root/vocab>path ] dip append-path ;
@ -147,12 +141,9 @@ M: string add-using drop ;
M: object add-using ( object -- ) M: object add-using ( object -- )
vocabulary>> using get [ adjoin ] [ drop ] if* ; vocabulary>> using get [ adjoin ] [ drop ] if* ;
: 4bl ( -- )
" " write ; inline
: ($values.) ( array -- ) : ($values.) ( array -- )
[ [
4bl " " write
[ bl ] [ [ bl ] [
"{ " write "{ " write
dup array? [ first ] when dup array? [ first ] when
@ -186,16 +177,13 @@ M: object add-using ( object -- )
] when* ; ] when* ;
: class-description. ( word -- ) : class-description. ( word -- )
drop drop "{ $class-description \"\" } ;" print ;
"{ $class-description \"\" } ;" print ;
: symbol-description. ( word -- ) : symbol-description. ( word -- )
drop drop "{ $var-description \"\" } ;" print ;
"{ $var-description \"\" } ;" print ;
: $description. ( word -- ) : $description. ( word -- )
drop drop "{ $description \"\" } ;" print ;
"{ $description \"\" } ;" print ;
: docs-body. ( word/symbol -- ) : docs-body. ( word/symbol -- )
{ {