Merge branch 'master' of github.com:JuliaLang/julia

jiahao · Mar 16, 2013 · b09dfc0 · b09dfc0
2 parents 1170b37 + 62c9a59
commit b09dfc0
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 0 deletions.
diff --git a/doc/helpdb.jl b/doc/helpdb.jl
@@ -5473,6 +5473,32 @@ error(Exception)
 
 "),
 
+("Filesystem","Base","isdir","isdir(s) -> Bool
+
+ Returns \"true\" if \"s\" is a directory path, \"false\" otherwise.
+
+"),
+
+("Filesystem","Base","isfifo","isfifo(s) -> Bool
+
+ Returns \"true\" if \"s\" is a FIFO path, \"false\" otherwise.
+
+"),
+
+("Filesystem","Base","isfile","isfile(s) -> Bool
+
+ Returns \"true\" if \"s\" is a regular file path, \"false\"
+ otherwise.
+
+"),
+
+("Filesystem","Base","islink","islink(s) -> Bool
+
+ Returns \"true\" if \"s\" is a symbolic link path, \"false\"
+ otherwise.
+
+"),
+
 ("GLPK","GLPK","set_prob_name","set_prob_name(glp_prob, name)
 
  Assigns a name to the problem object (or deletes it if \"name\" is

diff --git a/doc/stdlib/file.rst b/doc/stdlib/file.rst
@@ -0,0 +1,22 @@
+
+.. currentmodule:: Base
+
+Filesystem
+----------
+
+.. function:: isdir(s) -> Bool
+
+ Returns ``true`` if ``s`` is a directory path, ``false`` otherwise.
+
+.. function:: isfifo(s) -> Bool
+
+ Returns ``true`` if ``s`` is a FIFO path, ``false`` otherwise.
+
+.. function:: isfile(s) -> Bool
+
+ Returns ``true`` if ``s`` is a regular file path, ``false`` otherwise.
+
+.. function:: islink(s) -> Bool
+
+ Returns ``true`` if ``s`` is a symbolic link path, ``false`` otherwise.
+
diff --git a/doc/stdlib/index.rst b/doc/stdlib/index.rst
@@ -17,6 +17,7 @@ Built-ins
 
  base
  constants
+ file
  punctuation
 
 ****************