@@ -30,13 +30,13 @@ import Data.List.Views
3030%default total
3131
3232untilEOL : Recognise False
33−untilEOL = manyTill any (is '\n')
33+untilEOL = manyUntil (is '\n') any
3434
3535line : String -> Lexer
3636line s = exact s <+> space <+> untilEOL
3737
3838block : String -> String -> Lexer
39−block s e = exact s <+> manyTill any (exact e)
39+block s e = exact s <+> manyUntil (exact e) any
4040
4141data Token = CodeBlock String String String
4242 | Any String