Commits

james woodyatt  committed 8dad598

Add seqf to Cf_llscan.
Rollback the change to introduce phr and phrz to Cf_llscan.

  • Participants
  • Parent commits 66fa83d
  • Branches sideline

Comments (0)

Files changed (2)

File cf/cf_llscan.ml

     in
     enter
 
+let rec seqf f a p s =
+    match p s with
+    | None -> Some (a, s)
+    | Some (r, s) -> seqf f (f a r) p s
+
 let rec alt ps s =
     match ps with
     | [] -> None
         | None -> altz tl s
         | Some _ as r -> r
 
-let phr =
-    let ( >>= ) = bind in
-    let rec loop f a ps =
-        match ps with
-        | [] ->
-            ret a
-        | hd :: tl ->
-            hd >>= fun r ->
-            loop f (f a r) tl
-    in
-    loop
-
-let phrz =
-    let ( >>= ) = bind in
-    let rec loop f a pz =
-        match Lazy.force pz with
-        | Cf_seq.Z ->
-            ret a
-        | Cf_seq.P (hd, tl) ->
-            hd >>= fun r ->
-            loop f (f a r) tl
-    in
-    loop
-
 exception Error
 
 let err =

File cf/cf_llscan.mli

 val seqx1:
     ('a -> ('s, 'b) t) -> ('b -> 'a * 'c) -> 'a -> ('s, 'a * 'c * 'c list) t
 
+(** Use [seqf f a p] to create a scanner that recognizes any number of
+    instances of the pattern recognized by [p] and returns the result of
+    folding the application [f] into the outputs of each scanner using the
+    initial state [a].
+*)
+val seqf: ('a -> 'r -> 'a) -> 'a -> ('s, 'r) t -> ('s, 'a) t
+
 (** Use [alt ps] to create a scanner that produces the output from the first
     scanner in the list [ps] that recognizes a pattern in the input.  If no
     scanner in the list recognizes a pattern, then the scanner constructed by
 *)
 val altz: ('s, 'r) t Cf_seq.t -> ('s, 'r) t
 
-(** Use [phr f a ps] to compose the list of scanners [ps] into a phrase scanner
-    that recognizes each pattern in sequence and folds the application of [f]
-    to an accumulated state initialized by [a] to return the result.
-*)
-val phr: ('a -> 'r -> 'a) -> 'a -> ('s, 'r) t list -> ('s, 'a) t
-
-(** Use [phrz f a ps] to compose the lazy sequence of scanners [ps] into a
-    phrase scanner that recognizes each pattern in sequence and folds the
-    application of [f] to an accumulated state initialized by [a] to return the
-    result.
-*)
-val phrz: ('a -> 'r -> 'a) -> 'a -> ('s, 'r) t Cf_seq.t -> ('s, 'a) t
-
 (** Generic parser error with no parameters. *)
 exception Error