X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=lex.dcl;h=535487d1b750923c005453ecc48cc74fbac862b4;hb=e33962666f8af6a34432d57180eb322f4543eb78;hp=d6c421cf3425d5d78c02fed30c598528e2e9845a;hpb=98144e50ff2ca8e8d89dd1a39d4f2a41c2c6dab6;p=cc1516.git

diff --git a/lex.dcl b/lex.dcl
index d6c421c..535487d 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
@@ -21,12 +25,14 @@ import Data.Either
 	| BoolTypeToken     // Bool keyword
 	//Two character tokens
 	| DoubleColonToken  // ::
+	| NotEqualToken     // !=
 	| LesserEqToken     // <=
 	| GreaterEqToken    // >=
 	| EqualsToken       // ==
 	| AmpersandsToken   // &&
 	| PipesToken        // ||
     | ArrowToken        // ->
+	| EmptyListToken	// []
 	//One character tokens
 	| BraceOpenToken    // (
 	| BraceCloseToken   // )
@@ -47,11 +53,7 @@ import Data.Either
 	| LesserToken       // <
 	| BiggerToken       // >
 	| ExclamationToken  // !
-	//Special tokens
-	| EndOfFileToken    // EOF
 
-:: LexerOutput :== Either String [Token]
-
-instance toString LexerOutput
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput