Improved error type with position annotation

[cc1516.git] / src / yard.dcl

diff --git a/src/yard.dcl b/src/yard.dcl
index 266eb75..73a82c0 100644 (file)
--- 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 | Expected [String] Int
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
 
 instance Functor (Parser a)
@@ -18,6 +18,7 @@ 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
 satisfy :: (a -> Bool) -> Parser a a