<?> now accepts complete Errors

[cc1516.git] / src / yard.icl

diff --git a/src/yard.icl b/src/yard.icl
index 9ed6077..7b74454 100644 (file)
--- a/src/yard.icl
+++ b/src/yard.icl
@@ -17,7 +17,8 @@ import Data.Void
 instance toString Error where
        toString ParseError = "General parse error"
        toString (LexError e) = "Lexer error: " +++ e
-    toString (Unexpected e pos) = "Unexpected " +++ e +++ " at position " +++ (toString pos)
+    toString (Unexpected e (l,c)) = "Unexpected " +++ e +++ " at " 
+                                        +++ (toString l) +++ ":" +++ (toString c)
 
 runParser :: (Parser a b) [a] -> (Either Error b, [a])
 runParser (Parser f) i = f i
@@ -48,9 +49,9 @@ instance Alternative (Parser a) where
             (Right r, rest)  = (Right r, rest)
 
 //Try the parser, if it fails decorate the error with Expected of the given String and position
-(<?>) :: (Parser a b) (String, Int) -> Parser a b
-(<?>) p (e,pos) = Parser \i -> case runParser p i of
-    (Left e1, rest) = (Left $ e1 + Unexpected e pos, rest)
+(<?>) :: (Parser a b) Error -> Parser a b
+(<?>) p e = Parser \i -> case runParser p i of
+    (Left e1, rest) = (Left $ e1 + e, rest)
     (Right r, rest) = (Right r, rest)
 
 fail :: Parser a b
@@ -69,8 +70,8 @@ peek = Parser \i -> case i of
 //runs the left parser until the right parser succeeds. Returns the result of the left parser 
 //Note: if the right parser consumes input then this input is lost!
 //If the left parser fails before the right parser succeeds the whole parser fails
-until :: (Parser a b) (Parser a c) -> Parser a [b]
-until p guard = try $ until` p guard [] 
+(until) infix 2 :: (Parser a b) (Parser a c) -> Parser a [b]
+(until) p guard = try $ until` p guard [] 
     where
         until` :: (Parser a b) (Parser a c) [b] -> Parser a [b]
         until` p guard acc = Parser \i -> case runParser guard i of 
@@ -99,4 +100,4 @@ item :: a -> Parser a a | Eq a
 item a  = satisfy ((==)a)
 
 list :: [a] -> Parser a [a] | Eq a
-list as = mapM item as
\ No newline at end of file
+list as = mapM item as