curry gotcha

[cc1516.git] / lex.dcl

diff --git a/lex.dcl b/lex.dcl
index 7e41bc3..f524047 100644 (file)
--- 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,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