simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-07 03:35:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(parse): error in many

Browse source
This commit is contained in:
Simon Cruanes 2019-09-06 14:12:08 -05:00
parent 19fbd33278
commit 080f81a9dd
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/CCParse.ml
View file

@ -1,4 +1,3 @@
(* This file is free software. See file "license" for more details. *) (* This file is free software. See file "license" for more details. *)
(** {1 Very Simple Parser Combinators} *) (** {1 Very Simple Parser Combinators} *)
@ -347,7 +346,8 @@ let rec many_rec : 'a t -> 'a list -> 'a list t = fun p acc st ~ok ~err ->
p st p st
~ok:(fun x -> ~ok:(fun x ->
let i = pos st in let i = pos st in
many_rec p (x :: acc) st ~ok let acc = x :: acc in
many_rec p acc st ~ok
~err:(fun _ -> ~err:(fun _ ->
backtrack st i; backtrack st i;
ok(List.rev acc)) ok(List.rev acc))
@ -356,6 +356,17 @@ let rec many_rec : 'a t -> 'a list -> 'a list t = fun p acc st ~ok ~err ->
let many : 'a t -> 'a list t let many : 'a t -> 'a list t
= fun p st ~ok ~err -> many_rec p [] st ~ok ~err = fun p st ~ok ~err -> many_rec p [] st ~ok ~err
(*$R
let p0 = skip_white *> U.int in
let p = (skip_white *> char '(' *> many p0) <* try_ (skip_white <* char ')') in
let printer = CCFormat.(to_string @@ Dump.result @@ Dump.list int) in
assert_equal ~printer
(Ok [1;2;3]) (parse_string p "(1 2 3)");
assert_equal ~printer
(Ok [1;2; -30; 4]) (parse_string p "( 1 2 -30 4 )")
*)
let many1 : 'a t -> 'a list t = let many1 : 'a t -> 'a list t =
fun p st ~ok ~err -> fun p st ~ok ~err ->
p st ~ok:(fun x -> many_rec p [x] st ~ok ~err) ~err p st ~ok:(fun x -> many_rec p [x] st ~ok ~err) ~err