X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fyard.dcl;h=7d08a9c668daec506b912ac581d24bc117caca3f;hb=b3bedf1e825aaaee9134dddc6de82b373bf8b86b;hp=178356a48faf52796ad3f58875dc8df7a91b6da6;hpb=1ff731746e0ca7be7ae4dc09bb7e86e15b5ce42c;p=cc1516.git

diff --git a/src/yard.dcl b/src/yard.dcl
index 178356a..7d08a9c 100644
--- 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 = PositionalError Int Int String | Error String
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
 
 instance Functor (Parser a)
@@ -20,7 +20,7 @@ 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