X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fyard.dcl;h=a029c4b9b8617b7dc0b4d9c53032d733c3098d71;hb=3275e6545ebf0901e962065416cf95f5b35fa828;hp=73a82c0c5ed8416ca3a97c86d7606e88b8fb1f03;hpb=6e527e30012f8809594452cb9559b301b4a8afc6;p=cc1516.git

diff --git a/src/yard.dcl b/src/yard.dcl
index 73a82c0..a029c4b 100644
--- a/src/yard.dcl
+++ b/src/yard.dcl
@@ -6,8 +6,9 @@ from StdClass import class Eq
 from Data.Functor import class Functor
 from Control.Monad import class Monad
 from Control.Applicative import class Applicative, class Alternative
+import Data.Void
 
-:: Error = ParseError | LexError String | Expected [String] Int
+:: Error = ParseError | LexError String | Unexpected String Int
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
 
 instance Functor (Parser a)
@@ -21,6 +22,9 @@ 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
+eof :: Parser a Void