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

diff --git a/src/yard.dcl b/src/yard.dcl
index bc4f940..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)
@@ -18,16 +18,15 @@ 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
+(<?>) :: (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 :: (Parser a b) (Parser a c) -> Parser a [b]
+(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