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

diff --git a/lex.dcl b/lex.dcl
index 438e547..f524047 100644
--- a/lex.dcl
+++ b/lex.dcl
@@ -1,13 +1,16 @@
 definition module lex
 
-import Data.Either
+from Data.Either import :: Either
+from yard import :: Error
+from AST import :: Pos
 
-:: Token :== (Int, TokenValue)
+:: Token :== (Pos, TokenValue)
 :: TokenValue
 	//Value tokens
-	= IdentToken [Char] // Identifier
+	= IdentToken String // Identifier
 	| NumberToken Int   // Integer
 	| CharToken Char    // Character literal
+	| StringToken [Char]// String literal
 	//Keyword tokens
 	| VarToken          // var keyword
 	| ReturnToken       // return keyword
@@ -20,6 +23,7 @@ import Data.Either
 	| IntTypeToken      // Int keyword
 	| CharTypeToken     // Char keyword
 	| BoolTypeToken     // Bool keyword
+    | LetToken          // Let keyword
 	//Two character tokens
 	| DoubleColonToken  // ::
 	| NotEqualToken     // !=
@@ -29,6 +33,7 @@ import Data.Either
 	| AmpersandsToken   // &&
 	| PipesToken        // ||
     | ArrowToken        // ->
+	| EmptyListToken	// []
 	//One character tokens
 	| BraceOpenToken    // (
 	| BraceCloseToken   // )
@@ -49,9 +54,8 @@ import Data.Either
 	| LesserToken       // <
 	| BiggerToken       // >
 	| ExclamationToken  // !
-	//Special tokens
-	| EndOfFileToken    // EOF
+    | BackslashToken    // \
 
-:: LexerOutput :== Either String [Token]
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput