Fix embarrassing bug in Misc.Stdlib.String.split properly

master
Mark Shinwell 2016-03-17 10:37:49 +00:00
parent 7a9f3d50da
commit 391d7f05a9
1 changed files with 18 additions and 18 deletions

View File

@ -74,6 +74,24 @@ let rec split_last = function
(hd :: lst, last)
module Stdlib = struct
module String = struct
type t = string
let split s ~on =
let is_separator c = (c = on) in
let rec split1 res i =
if i >= String.length s then res else begin
if is_separator s.[i] then split1 res (i+1)
else split2 res i (i+1)
end
and split2 res i j =
if j >= String.length s then String.sub s i (j-i) :: res else begin
if is_separator s.[j] then split1 (String.sub s i (j-i) :: res) (j+1)
else split2 res i (j+1)
end
in List.rev (split1 [] 0)
end
module List = struct
type 'a t = 'a list
@ -163,24 +181,6 @@ module Stdlib = struct
| None -> default
| Some a -> f a
end
module String = struct
type t = string
let split s ~on =
let is_separator c = (c = on) in
let rec split1 res i =
if i >= String.length s then res else begin
if is_separator s.[i] then split1 res (i+1)
else split2 res i (i+1)
end
and split2 res i j =
if j >= String.length s then String.sub s i (j-i) :: res else begin
if is_separator s.[j] then split1 (String.sub s i (j-i) :: res) (j+1)
else split2 res i (j+1)
end
in List.rev (split1 [] 0)
end
end
let may = Stdlib.Option.iter