diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2009-05-20 11:52:42 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2009-05-20 11:52:42 +0000 |
| commit | ed32f569e3b636e0f12efdbbd5bba9e05cc434ac (patch) | |
| tree | 20b551901a72edf7733a6fe5287deab21ed9b83b /debugger/unix_tools.ml | |
| parent | 7795eafa896b0c5b3066d5efec7ec49d69d44e4d (diff) | |
merge changes from ocaml3110 to ocaml3111rc0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9270 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'debugger/unix_tools.ml')
| -rw-r--r-- | debugger/unix_tools.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debugger/unix_tools.ml b/debugger/unix_tools.ml index 5328a2aad..9926e05d5 100644 --- a/debugger/unix_tools.ml +++ b/debugger/unix_tools.ml @@ -22,7 +22,7 @@ open Primitives (*** Convert a socket name into a socket address. ***) let convert_address address = try - let n = string_pos address ':' in + let n = String.index address ':' in let host = String.sub address 0 n and port = String.sub address (n + 1) (String.length address - n - 1) in @@ -90,7 +90,7 @@ let search_in_path name = let rec expand_path ch = let rec subst_variable ch = try - let pos = string_pos ch '$' in + let pos = String.index ch '$' in if (pos + 1 < String.length ch) && (ch.[pos + 1] = '$') then (String.sub ch 0 (pos + 1)) ^ (subst_variable @@ -121,7 +121,7 @@ let rec expand_path ch = in if ch.[0] = '~' then try - match string_pos ch '/' with + match String.index ch '/' with 1 -> (let tail = String.sub ch 2 (String.length ch - 2) in |