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

io.pathnames: remove file-directory (redundant to parent-directory).

db4
John Benediktsson 2012-10-23 09:47:57 -07:00
parent 87f55eb033
commit 5c810c2fa5
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/io/pathnames/pathnames-docs.factor
View File

@ -39,15 +39,7 @@ HELP: file-stem
{ $example "USING: io.pathnames prettyprint ;" "\"/home/csi/gui.vbs\" file-stem ." "\"gui\"" }
} ;
HELP: file-directory
{ $values { "path" "a pathname string" } { "directory" string } }
{ $description "Outputs the directory of " { $snippet "path" } " with the " { $link file-name } " removed, if any." }
{ $examples
{ $example "USING: io.pathnames prettyprint ;" "\"/usr/bin/gcc\" file-directory ." "\"/usr/bin\"" }
{ $example "USING: io.pathnames prettyprint ;" "\"/home/csi/gui.vbs\" file-directory ." "\"/home/csi\"" }
} ;
{ file-name file-stem file-extension file-directory } related-words
{ file-name file-stem file-extension } related-words
HELP: path-components
{ $values { "path" "a pathnames string" } { "seq" sequence } }

12
core/io/pathnames/pathnames.factor
View File

@ -76,13 +76,6 @@ ERROR: no-parent-directory path ;
[ f ]
} cond ;
: special-path ( path -- prefix )
{
{ [ dup "resource:" head? ] [ drop "resource:" ] }
{ [ dup "vocab:" head? ] [ drop "vocab:" ] }
[ drop "" ]
} cond ;
PRIVATE>
: absolute-path? ( path -- ? )
@ -132,11 +125,6 @@ PRIVATE>
: file-extension ( path -- extension )
file-name "." split1-last nip ;
: file-directory ( path -- directory )
[ special-path ] [ special-path? drop ] bi
dup last-path-separator [ head append ] [ 2drop ] if
[ path-separator ] when-empty ;
: path-components ( path -- seq )
normalize-path path-separator split harvest ;