X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Fyard.icl;h=932999a6a40966fe8bf6fab6179b496e96a573b9;hb=178532b9e5843308b2b076b4d8881f6971cd718c;hp=278bac861d8ccf8d1b8e4fa90b8d2ab23496b843;hpb=a0cf809b53126a797667fb43f8496a7cc2b7252e;p=cc1516.git

diff --git a/src/yard.icl b/src/yard.icl
index 278bac8..932999a 100644
--- a/src/yard.icl
+++ b/src/yard.icl
@@ -4,6 +4,9 @@ import StdTuple
 import StdClass
 import StdString
 import StdList
+import StdInt
+from Data.List import intersperse
+from Text import instance Text String, class Text(concat)
 import Data.Functor
 import Data.Either
 import Control.Monad
@@ -13,6 +16,8 @@ from Data.Func import $
 instance toString Error where
 	toString ParseError = "General parse error"
 	toString (LexError e) = "Lexer error: " +++ e
+    toString (Expected ts pos) = "Expected " +++ (concat $ intersperse ", " ts) 
+                                             +++ " at position " +++ (toString pos)
 
 instance + Error where
     (+) (Expected as _) (Expected bs p) = Expected (as++bs) p