.

[cc1516.git] / lex.dcl

diff --git a/lex.dcl b/lex.dcl
index e78d495..46c1713 100644 (file)
--- a/lex.dcl
+++ b/lex.dcl
@@ -2,11 +2,9 @@ definition module lex
 
 from Data.Either import :: Either
 from yard import :: Error
+from AST import :: Pos
 
-:: Token = {
-       line :: Int,
-       column :: Int,
-       token :: TokenValue}
+:: Token :== (Pos, TokenValue)
 :: TokenValue
        //Value tokens
        = IdentToken String // Identifier
@@ -54,8 +52,6 @@ from yard import :: Error
        | LesserToken       // <
        | BiggerToken       // >
        | ExclamationToken  // !
-       //Special tokens
-       | EndOfFileToken    // EOF
 
 :: LexerOutput :== Either Error [Token]