Commits

camlspotter committed e37574e

planck change

  • Participants
  • Parent commits 5e412f6
  • Branches dev

Comments (0)

Files changed (3)

 open P
 
 let rec top = lazy (
-  token BEGIN >>= fun () -> !!in_begin
+  token BEGIN >>= fun () -> 
+  !!in_begin
 )
 
 and in_begin = lazy (
-  token END <|> (take_ >>= fun () -> !!in_begin)
+  token END 
+  <|> (take >>= fun tkn -> 
+       
+       !!in_begin)
 )
   
   
 open Reader
 module Parser = Xparser
 open Parser
-open Planck.Lazylist
 
 module Elem = struct
   type t = Parser.token
 
   let position t = t.region
 
-  let default = { region = Region.none;
-                  substr = "";
-                  space = Region.none, "" }
 end
 
 module Stream = Planck.Stream.Make(struct
 
     let attr = { Attr.region; substr; space = space_between_region, space_between } in
     match token with
-    | EOF -> null_desc attr
-    | _ -> cons_desc token attr (lazy (loop region))
+    | EOF -> Stream.null_desc attr
+    | _ -> Stream.cons_desc token attr (lazy (loop region))
   in
   lazy (loop & Region.top ""), ic
 

File tokenstr.mli

-open Planck.Lazylist
+open Spotlib.Stream
 open Pos
 
 module Attr : sig