curry gotcha

[cc1516.git] / lex.dcl

diff --git a/lex.dcl b/lex.dcl
index 46a3ab8..f524047 100644 (file)
--- a/lex.dcl
+++ b/lex.dcl
@@ -1,26 +1,44 @@
 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
-       | VoidToken         // void keyword
        | ReturnToken       // return keyword
        | IfToken           // if keyword
        | ElseToken         // else keyword
        | WhileToken        // while keyword
        | TrueToken         // True keyword
        | FalseToken        // False keyword
+       | VoidToken         // Void keyword
+       | IntTypeToken      // Int keyword
+       | CharTypeToken     // Char keyword
+       | BoolTypeToken     // Bool keyword
+    | LetToken          // Let keyword
+       //Two character tokens
+       | DoubleColonToken  // ::
+       | NotEqualToken     // !=
+       | LesserEqToken     // <=
+       | GreaterEqToken    // >=
+       | EqualsToken       // ==
+       | AmpersandsToken   // &&
+       | PipesToken        // ||
+    | ArrowToken        // ->
+       | EmptyListToken        // []
        //One character tokens
        | BraceOpenToken    // (
        | BraceCloseToken   // )
        | CBraceOpenToken   // {
-       | CBraceCloseToken  // {
+       | CBraceCloseToken  // }
        | SquareOpenToken   // [
        | SquareCloseToken  // ]
        | CommaToken        // ,
@@ -36,16 +54,8 @@ import Data.Either
        | LesserToken       // <
        | BiggerToken       // >
        | ExclamationToken  // !
-       //Two character tokens
-       | DoubleColonToken  // ::
-       | LesserEqToken     // <=
-       | GreaterEqToken    // >=
-       | EqualsToken       // ==
-       | AmpersandsToken   // &&
-       | PipesToken        // ||
-    | ArrowToken        // ->
-       | EndOfFileToken    // EOF
+    | BackslashToken    // \
 
-:: LexerOutput :== Either String [Token]
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput