X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=yard.dcl;h=c3024200eaa4f5c524dd3b2731f0dca0d4f3b99b;hb=a8130cb2a970f385a7da0e2a8f7b02c1cb1a7639;hp=9f40539fcf697211f1decd7929c04f68aaf358b8;hpb=89c1b0d0eb0851e93ae19ab934033af3ec50518f;p=cc1516.git

diff --git a/yard.dcl b/yard.dcl
index 9f40539..c302420 100644
--- a/yard.dcl
+++ b/yard.dcl
@@ -1,23 +1,32 @@
 definition module yard
 
+from StdString import class toString
 from Data.Either import :: Either
-from StdClass import class Eq
+from StdClass import class ==, 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 = PositionalError Int Int String | Error String
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
-:: Error = ParseException
-
-runParser :: (Parser a b) [a] -> (Either Error b, [a])
 
 instance Functor (Parser a)
 instance Applicative (Parser a) 
 instance Monad (Parser a)
 instance Alternative (Parser a)
 
+instance toString Error
+
+
+runParser :: (Parser a b) [a] -> (Either Error b, [a])
+(<?>) :: (Parser a b) Error -> 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) infix 2 :: (Parser a b) (Parser a c) -> Parser a [b]
 item :: a -> Parser a a | Eq a
-list :: [a] -> Parser a [a] | Eq a
\ No newline at end of file
+list :: [a] -> Parser a [a] | Eq a
+eof :: Parser a Void