X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Flex.dcl;h=e78d495a938dfe2fe934934f3a2bc168333f4329;hb=f5231ebadae1ac54e25dbf5819debb3ab625826d;hp=2c6f0aaa220b507739d611d0412f229c11a571e4;hpb=4932517e2d12cd55922231175bf2f0a06f5b85d6;p=cc1516.git

diff --git a/src/lex.dcl b/src/lex.dcl
index 2c6f0aa..e78d495 100644
--- a/src/lex.dcl
+++ b/src/lex.dcl
@@ -1,11 +1,15 @@
 definition module lex
 
 from Data.Either import :: Either
+from yard import :: Error
 
-:: Token :== (Int, TokenValue)
+:: Token = {
+	line :: Int,
+	column :: Int,
+	token :: TokenValue}
 :: TokenValue
 	//Value tokens
-	= IdentToken [Char] // Identifier
+	= IdentToken String // Identifier
 	| NumberToken Int   // Integer
 	| CharToken Char    // Character literal
 	//Keyword tokens
@@ -53,6 +57,6 @@ from Data.Either import :: Either
 	//Special tokens
 	| EndOfFileToken    // EOF
 
-:: LexerOutput :== Either String [Token]
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput