X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=lex.dcl;h=e78d495a938dfe2fe934934f3a2bc168333f4329;hb=6b3981fb80952fe2c510b6f9b849adb0dff77d2c;hp=e141b94706cd528ec40d7e818e7cada8026f6222;hpb=345b80b49413bb1b52735fb155faded41456a6b7;p=cc1516.git

diff --git a/lex.dcl b/lex.dcl
index e141b94..e78d495 100644
--- a/lex.dcl
+++ b/lex.dcl
@@ -1,12 +1,16 @@
 definition module lex
 
-import Data.Either
+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
-	| NumberToken [Char]// Integer
+	= IdentToken String // Identifier
+	| NumberToken Int   // Integer
 	| CharToken Char    // Character literal
 	//Keyword tokens
 	| VarToken          // var keyword
@@ -29,6 +33,7 @@ import Data.Either
 	| AmpersandsToken   // &&
 	| PipesToken        // ||
     | ArrowToken        // ->
+	| EmptyListToken	// []
 	//One character tokens
 	| BraceOpenToken    // (
 	| BraceCloseToken   // )
@@ -52,6 +57,6 @@ import Data.Either
 	//Special tokens
 	| EndOfFileToken    // EOF
 
-:: LexerOutput :== Either String [Token]
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput