diff options
| author |  ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-14 11:05:35 +0000 |
|---|---|---|
| committer | ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-14 11:05:35 +0000 |
| commit | d9f9673d90371ead668863221c1202de49ab1782 (patch) | |
| tree | 3fca5420ce4404972f87ea05d2000e3fd8e89017 /lib/envars.ml | |
| parent | 9a0c61b81a2d9c0024b20a6c7ad8af01026739b0 (diff) | |
Moved Stringset and Stringmap to String namespace.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16068 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'lib/envars.ml')
| -rw-r--r-- | lib/envars.ml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/envars.ml b/lib/envars.ml index a4629e50d..097ffe08e 100644 --- a/lib/envars.ml +++ b/lib/envars.ml @@ -6,6 +6,8 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) +open Util + (** {1 Helper functions} *) let getenv_else s dft = try Sys.getenv s with Not_found -> dft () @@ -31,7 +33,7 @@ let home ~warn = let path_to_list p = let sep = if Sys.os_type = "Win32" then ';' else ':' in - Util.String.split sep p + String.split sep p let user_path () = let path = try Sys.getenv "PATH" with _ -> raise Not_found in @@ -161,7 +163,7 @@ let camllib () = else let com = ocamlc () ^ " -where" in let _, res = CUnix.run_command (fun x -> x) (fun _ -> ()) com in - Util.String.strip res + String.strip res (** {2 Camlp4 paths} *) @@ -187,7 +189,7 @@ let camlp4lib () = let com = camlp4 () ^ " -where" in let ex, res = CUnix.run_command (fun x -> x) (fun _ -> ()) com in match ex with - | Unix.WEXITED 0 -> Util.String.strip res + | Unix.WEXITED 0 -> String.strip res | _ -> "/dev/null" (** {1 XDG utilities} *) |