X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fyard.dcl;h=cedf0dfc497155405c8119d6a974ce3e82f9a3f0;hb=6c1945d3b85c0bf8ff2d56b4a6fb456d07a7282a;hp=266eb75e4e727f470a98d8e869431d978687188d;hpb=051a7614b88beaea2912dd9f76d04d9a90ec2f99;p=cc1516.git

diff --git a/src/yard.dcl b/src/yard.dcl
index 266eb75..cedf0df 100644
--- a/src/yard.dcl
+++ b/src/yard.dcl
@@ -7,7 +7,7 @@ from Data.Functor import class Functor
 from Control.Monad import class Monad
 from Control.Applicative import class Applicative, class Alternative
 
-:: Error = ParseError | LexError String | Expected [String]
+:: Error = ParseError | LexError String | Unexpected String Int
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
 
 instance Functor (Parser a)
@@ -18,8 +18,11 @@ instance Alternative (Parser a)
 instance toString Error
 
 runParser :: (Parser a b) [a] -> (Either Error b, [a])
+(<?>) :: (Parser a b) (String, Int) -> Parser a b
 fail :: Parser a b
 top :: Parser a a
+peek :: Parser a a
 satisfy :: (a -> Bool) -> Parser a a
+check :: (a -> Bool) -> Parser a a
 item :: a -> Parser a a | Eq a
 list :: [a] -> Parser a [a] | Eq a