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

diff --git a/lex.dcl b/lex.dcl
index d1daf7c..f524047 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
+from AST import :: Pos
 
-:: Token
+:: Token :== (Pos, TokenValue)
+:: TokenValue
 	//Value tokens
-	= IdentToken [Char] // Identifier
-	| NumberToken [Char]// Integer
+	= IdentToken String // Identifier
+	| NumberToken Int   // Integer
 	| CharToken Char    // Character literal
+	| StringToken [Char]// String literal
 	//Keyword tokens
 	| VarToken          // var keyword
 	| ReturnToken       // return keyword
@@ -19,6 +23,7 @@ import Data.Either
 	| IntTypeToken      // Int keyword
 	| CharTypeToken     // Char keyword
 	| BoolTypeToken     // Bool keyword
+    | LetToken          // Let keyword
 	//Two character tokens
 	| DoubleColonToken  // ::
 	| NotEqualToken     // !=
@@ -28,6 +33,7 @@ import Data.Either
 	| AmpersandsToken   // &&
 	| PipesToken        // ||
     | ArrowToken        // ->
+	| EmptyListToken	// []
 	//One character tokens
 	| BraceOpenToken    // (
 	| BraceCloseToken   // )
@@ -48,11 +54,8 @@ import Data.Either
 	| LesserToken       // <
 	| BiggerToken       // >
 	| ExclamationToken  // !
-	//Special tokens
-	| EndOfFileToken    // EOF
+    | BackslashToken    // \
 
-:: LexerOutput :== Either String [Token]
-
-instance toString LexerOutput
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput