X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fparse.icl;h=7320b1123fde5c4f75e3c29e84cdb5fbed6ef665;hb=0f1c66df34b0f65709756b070884c33b94e6a9ba;hp=ec89565f05c71a9645d3123df289adb81e73633b;hpb=eb91d7c6b2010be6a43de0a978373654ba3deacc;p=cc1516.git

diff --git a/src/parse.icl b/src/parse.icl
index ec89565..7320b11 100644
--- a/src/parse.icl
+++ b/src/parse.icl
@@ -20,12 +20,12 @@ import lex
 parser :: LexerOutput -> ParserOutput
 parser (Left e) = Left $ toString $ LexError e
 parser (Right r) = case runParser parseProgram r of
-	(Right p, _) = Right p
+	(Right p, []) = Right p
+	(Right p, x) = Left "Unparsed tokens: "//TODO
 	(Left e, _) = Left $ toString e
 
 parseProgram :: Parser Token AST
 parseProgram = liftM2 AST (many parseVarDecl) (some parseFunDecl) 
-	<* satTok EndOfFileToken
 
 parseFunDecl :: Parser Token FunDecl
 parseFunDecl = liftM5 FunDecl
@@ -178,7 +178,7 @@ derive gEq TokenValue
 satTok :: TokenValue -> Parser Token Token
 satTok t = top >>= \tok=:(pos1, pos2, tv) -> if (eq t tok) 
                                             (return tok) 
-                                            (fail <?> (printToString tv+++printToString t, pos1))
+                                            (fail <?> Unexpected (printToString tv) (pos1, pos2))
 	where
 		eq (IdentToken _) (_, _, IdentToken _) = True
 		eq (NumberToken _) (_, _, NumberToken _) = True