io.files.info: Longer names for file-info predicates.

diff --git a/basis/io/files/info/info-docs.factor b/basis/io/files/info/info-docs.factor
index 6c608e71d8224c3ac8794516ca0649f63aefa61b..7e57d66b99a099b2bf417865bc749a06db9ccab2 100644 (file)
--- a/basis/io/files/info/info-docs.factor
+++ b/basis/io/files/info/info-docs.factor
@@ -16,13 +16,13 @@ HELP: directory?
 { $values { "file-info" file-info } { "?" "a boolean" } }
 { $description "Tests if " { $snippet "file-info" } " is a directory." } ;
 
-HELP: file?
+HELP: regular-file?
 { $values { "file-info" file-info } { "?" "a boolean" } }
-{ $description "Tests if " { $snippet "file-info" } " is a file." } ;
+{ $description "Tests if " { $snippet "file-info" } " is a normal file." } ;
 
-HELP: symlink?
+HELP: symbolic-link?
 { $values { "file-info" file-info } { "?" "a boolean" } }
-{ $description "Tests if " { $snippet "file-info" } " is a symlink." } ;
+{ $description "Tests if " { $snippet "file-info" } " is a symbolic link." } ;
 
 HELP: file-systems
 { $values { "array" array } }
@@ -67,8 +67,8 @@ ARTICLE: "io.files.info" "File system meta-data"
     link-info
     exists?
     directory?
-    file?
-    symlink?
+    regular-file?
+    symbolic-link?
 }
 "File types:"
 { $subsections "file-types" }

diff --git a/basis/io/files/info/info.factor b/basis/io/files/info/info.factor
index 23a271ba618d096fe96b52f9049145ba231523da..f2c7767524d7a6652a4a6a8c4c777d9a82d134eb 100644 (file)
--- a/basis/io/files/info/info.factor
+++ b/basis/io/files/info/info.factor
@@ -13,8 +13,8 @@ HOOK: file-info os ( path -- info )
 HOOK: link-info os ( path -- info )
 
 : directory? ( file-info -- ? ) type>> +directory+ = ;
-: file? ( file-info -- ? ) type>> +regular-file+ = ;
-: symlink? ( file-info -- ? ) type>> +symbolic-link+ = ;
+: regular-file? ( file-info -- ? ) type>> +regular-file+ = ;
+: symbolic-link? ( file-info -- ? ) type>> +symbolic-link+ = ;
 
 : sparse-file? ( file-info -- ? )
     [ size-on-disk>> ] [ size>> ] bi < ;