X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fyard.dcl;h=bc4f940ef3e77836a8f327d016747111920a4653;hb=ca00099482644c76d6d918f536f69db32ac85058;hp=76b6c17e33ebe664c137e4523a05dc5a6a0a96f1;hpb=b4636110ab65f233ed40d4390b62c7799df3c949;p=cc1516.git

diff --git a/src/yard.dcl b/src/yard.dcl
index 76b6c17..bc4f940 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
+:: Error = ParseError | LexError String | Unexpected String Int
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
 
 instance Functor (Parser a)
@@ -17,9 +18,16 @@ instance Alternative (Parser a)
 
 instance toString Error
 
+//(`until`) infix 1
+
 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
+until :: (Parser a b) (Parser a c) -> Parser a [b]
 item :: a -> Parser a a | Eq a
 list :: [a] -> Parser a [a] | Eq a
+eof :: Parser a Void