X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=lex.dcl;h=a6cf7c661a2927ed12caff506af75875c7fe46d6;hb=d5abf2ad34be35640d0e1b04d4f3da24e4ea9967;hp=d1daf7cf991b6b3a6ae7a022f4fad3fce51314eb;hpb=889d4798a0da64d76422da98378f5e5c35f0bf32;p=cc1516.git

diff --git a/lex.dcl b/lex.dcl
index d1daf7c..a6cf7c6 100644
--- a/lex.dcl
+++ b/lex.dcl
@@ -1,11 +1,15 @@
 definition module lex
 
-import Data.Either
+from Data.Either import :: Either
+from yard import :: Error
 
-:: Token
+from AST import :: Pos
+
+:: Token :== (Pos, 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
@@ -28,6 +32,7 @@ import Data.Either
 	| AmpersandsToken   // &&
 	| PipesToken        // ||
     | ArrowToken        // ->
+	| EmptyListToken	// []
 	//One character tokens
 	| BraceOpenToken    // (
 	| BraceCloseToken   // )
@@ -51,8 +56,6 @@ import Data.Either
 	//Special tokens
 	| EndOfFileToken    // EOF
 
-:: LexerOutput :== Either String [Token]
-
-instance toString LexerOutput
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput