is_absolute -> is_relative/is_implicit

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1617 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 45 insertions, 24 deletions

diff --git a/stdlib/filename.ml b/stdlib/filename.ml
index 611c4f6a3..e32ba2868 100644
--- a/stdlib/filename.ml
+++ b/stdlib/filename.ml
@@ -43,34 +43,50 @@ let concat =
   | "MacOS" -> mac_concat
   | _ -> invalid_arg "Filename.concat: unknown system"
 
-let unix_is_absolute n =
-     (String.length n >= 1 && String.sub n 0 1 = "/")
-  || (String.length n >= 2 && String.sub n 0 2 = "./")
-  || (String.length n >= 3 && String.sub n 0 3 = "../")
-
-let wnt_is_absolute n =
-     (String.length n >= 1 &&
-       (let s = String.sub n 0 1 in s = "/" || s = "\\"))
-  || (String.length n >= 2 &&
-       (let s = String.sub n 0 2 in s = "./" || s = ".\\"))
-  || (String.length n >= 3 &&
-       (let s = String.sub n 0 3 in s = "../" || s = "..\\"))
-  || (String.length n >= 2 && String.get n 1 = ':')
-
-let mac_is_absolute n =
+let unix_is_relative n = String.length n < 1 || n.[0] <> '/';;
+
+let unix_is_implicit n =
+  unix_is_relative n
+  && (String.length n < 2 || String.sub n 0 2 <> "./")
+  && (String.length n < 3 || String.sub n 0 3 <> "../")
+;;
+
+let wnt_is_relative n =
+  (String.length n < 1 || n.[0] <> '/')
+  && (String.length n < 1 || n.[0] <> '\\')
+  && (String.length n < 2 || n.[1] <> ':')
+;;
+
+let wnt_is_implicit n =
+  wnt_is_relative n
+  && (String.length n < 2 || String.sub n 0 2 <> "./")
+  && (String.length n < 2 || String.sub n 0 2 <> ".\\")
+  && (String.length n < 3 || String.sub n 0 3 <> "../")
+  && (String.length n < 3 || String.sub n 0 3 <> "..\\")
+;;
+
+let contains_colon n =
   try
     for i = 0 to String.length n - 1 do
       if n.[i] = ':' then raise Exit
     done;
     false
   with Exit -> true
+;;
 
-let is_absolute =
+let mac_is_relative n =
+  (String.length n >= 1 && n.[0] = ':')
+  || not (contains_colon n)
+;;
+
+let mac_is_implicit n = not (contains_colon n);;
+
+let (is_relative, is_implicit) =
   match Sys.os_type with
-  | "Unix" -> unix_is_absolute
-  | "Win32" -> wnt_is_absolute
-  | "MacOS" -> mac_is_absolute
-  | _ -> invalid_arg "Filename.is_absolute: unknown system"
+  | "Unix" -> (unix_is_relative, unix_is_implicit)
+  | "Win32" -> (wnt_is_relative, wnt_is_implicit)
+  | "MacOS" -> (mac_is_relative, mac_is_implicit)
+  | _ -> invalid_arg "Filename.is_relative: unknown system"
 
 let unix_check_suffix name suff =
  String.length name >= String.length suff &&
diff --git a/stdlib/filename.mli b/stdlib/filename.mli
index 9763c6cc7..75b848902 100644
--- a/stdlib/filename.mli
+++ b/stdlib/filename.mli
@@ -19,10 +19,15 @@ val current_dir_name : string
 val concat : string -> string -> string
         (* [concat dir file] returns a file name that designates file
            [file] in directory [dir]. *)
-val is_absolute : string -> bool
-        (* Return [true] if the file name is absolute or starts with an
-           explicit reference to the current directory ([./] or [../] in
-           Unix), and [false] if it is relative to the current directory. *)
+val is_relative : string -> bool
+        (* Return [true] if the file name is relative to the current
+           directory, [false] if it is absolute (i.e. in Unix, starts
+           with [/]. *)
+val is_implicit : string -> bool
+        (* Return [true] if the file name is relative and does not start
+           with an explicit reference to the current directory ([./] or
+           [../] in Unix), [false] if it starts with an explicit reference
+           to the root directory or the current directory. *)
 val check_suffix : string -> string -> bool
         (* [check_suffix name suff] returns [true] if the filename [name]
            ends with the suffix [suff]. *)