From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 29 Feb 2016 12:55:42 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/cc1516
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=6e527e30012f8809594452cb9559b301b4a8afc6;hp=798defc398c2e3df810cc8fd3dccf861103006a5;p=cc1516.git

Merge branch 'master' of github.com:dopefishh/cc1516
---

diff --git a/src/main.prj b/src/main.prj
index 177aab2..7ba18dc 100644
--- a/src/main.prj
+++ b/src/main.prj
@@ -685,6 +685,20 @@ OtherModules
 			ReadableABC:	False
 			ReuseUniqueNodes:	True
 			Fusion:	False
+	Module
+		Name:	StdMaybe
+		Dir:	{Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent/Deprecated/StdLib
+		Compiler
+			NeverMemoryProfile:	False
+			NeverTimeProfile:	False
+			StrictnessAnalysis:	True
+			ListTypes:	StrictExportTypes
+			ListAttributes:	True
+			Warnings:	True
+			Verbose:	True
+			ReadableABC:	False
+			ReuseUniqueNodes:	True
+			Fusion:	False
 	Module
 		Name:	System.OS
 		Dir:	{Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64
@@ -727,6 +741,20 @@ OtherModules
 			ReadableABC:	False
 			ReuseUniqueNodes:	True
 			Fusion:	False
+	Module
+		Name:	GenPrint
+		Dir:	{Application}/lib/iTasks-SDK/Patches/Generics
+		Compiler
+			NeverMemoryProfile:	False
+			NeverTimeProfile:	False
+			StrictnessAnalysis:	True
+			ListTypes:	StrictExportTypes
+			ListAttributes:	True
+			Warnings:	True
+			Verbose:	True
+			ReadableABC:	False
+			ReuseUniqueNodes:	True
+			Fusion:	False
 	Module
 		Name:	StdGeneric
 		Dir:	{Application}/lib/iTasks-SDK/Patches/StdEnv
diff --git a/src/parse.icl b/src/parse.icl
index b3046e0..0860819 100644
--- a/src/parse.icl
+++ b/src/parse.icl
@@ -12,6 +12,7 @@ import Control.Applicative
 import Data.Func
 from Data.List import intercalate, replicate, instance Functor []
 from Text import class Text(concat), instance Text String
+import GenPrint
 
 import yard
 import lex
@@ -171,9 +172,10 @@ trans2 t f = satTok t >>= \(_, r).pure (f r)
 trans1 :: TokenValue a -> Parser Token a
 trans1 t r = trans2 t $ const r
 
+derive gPrint TokenValue
 derive gEq TokenValue
 satTok :: TokenValue -> Parser Token Token
-satTok t = satisfy $ eq t
+satTok t = top >>= \tok=:(pos, tv) -> if (eq t tok) (return tok) (fail <?> (printToString t, pos))
 	where
 		eq (IdentToken _) (_, IdentToken _) = True
 		eq (NumberToken _) (_, NumberToken _) = True
diff --git a/src/yard.dcl b/src/yard.dcl
index 266eb75..73a82c0 100644
--- a/src/yard.dcl
+++ b/src/yard.dcl
@@ -7,7 +7,7 @@ from Data.Functor import class Functor
 from Control.Monad import class Monad
 from Control.Applicative import class Applicative, class Alternative
 
-:: Error = ParseError | LexError String | Expected [String]
+:: Error = ParseError | LexError String | Expected [String] Int
 :: Parser a b = Parser ([a] -> (Either Error b, [a]))
 
 instance Functor (Parser a)
@@ -18,6 +18,7 @@ instance Alternative (Parser a)
 instance toString Error
 
 runParser :: (Parser a b) [a] -> (Either Error b, [a])
+(<?>) :: (Parser a b) (String, Int) -> Parser a b
 fail :: Parser a b
 top :: Parser a a
 satisfy :: (a -> Bool) -> Parser a a
diff --git a/src/yard.icl b/src/yard.icl
index 5460312..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,10 +16,12 @@ 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) = Expected (as++bs)
-    (+) _ r                         = r
+    (+) (Expected as _) (Expected bs p) = Expected (as++bs) p
+    (+) _ r                             = r
 
 runParser :: (Parser a b) [a] -> (Either Error b, [a])
 runParser (Parser f) i = f i
@@ -41,9 +46,10 @@ instance Alternative (Parser a) where
             (Right r, rest) = (Right r, rest)
             (Left e2, rest) = (Left (e1+e2), rest)
 
-<?> :: (Parser a b) String -> Parser a b
-<?> p e = Parser \i -> case runParser p i of
-    (Left e1, rest) = (Left (e1+(Expected [e])), 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) = let error = (e1+(Expected [e] pos)) in (Left error, rest)
     (Right r, rest) = (Right r, rest)
 
 fail :: Parser a b