<?> now accepts complete Errors

[cc1516.git] / src / yard.dcl

diff --git a/src/yard.dcl b/src/yard.dcl
index a029c4b..a40b42d 100644 (file)
--- a/src/yard.dcl
+++ b/src/yard.dcl
@@ -8,7 +8,7 @@ from Control.Monad import class Monad
 from Control.Applicative import class Applicative, class Alternative
 import Data.Void
 
-:: Error = ParseError | LexError String | Unexpected String Int
+:: Error = ParseError | LexError String | Unexpected String (Int, Int)
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
 
 instance Functor (Parser a)
@@ -18,13 +18,15 @@ instance Alternative (Parser a)
 
 instance toString Error
 
+
 runParser :: (Parser a b) [a] -> (Either Error b, [a])
-(<?>) :: (Parser a b) (String, Int) -> Parser a b
+(<?>) :: (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
 eof :: Parser a Void