X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=lex.dcl;h=a6cf7c661a2927ed12caff506af75875c7fe46d6;hb=9e30ea275d06506244e92f26c121715cbfd9c315;hp=a887374897f439bf44ae4fd8547dbd4e88009ab5;hpb=4766205e7035a58c8a1fa1557b6e14577ed26f32;p=cc1516.git

diff --git a/lex.dcl b/lex.dcl
index a887374..a6cf7c6 100644
--- a/lex.dcl
+++ b/lex.dcl
@@ -1,11 +1,14 @@
 definition module lex
 
 from Data.Either import :: Either
+from yard import :: Error
 
-:: Token :== (Int, TokenValue)
+from AST import :: Pos
+
+:: Token :== (Pos, TokenValue)
 :: TokenValue
 	//Value tokens
-	= IdentToken [Char] // Identifier
+	= IdentToken String // Identifier
 	| NumberToken Int   // Integer
 	| CharToken Char    // Character literal
 	//Keyword tokens
@@ -29,6 +32,7 @@ from Data.Either import :: Either
 	| AmpersandsToken   // &&
 	| PipesToken        // ||
     | ArrowToken        // ->
+	| EmptyListToken	// []
 	//One character tokens
 	| BraceOpenToken    // (
 	| BraceCloseToken   // )
@@ -52,6 +56,6 @@ from Data.Either import :: Either
 	//Special tokens
 	| EndOfFileToken    // EOF
 
-:: LexerOutput :== Either String [Token]
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput