type

[cc1516.git] / src / lex.dcl

diff --git a/src/lex.dcl b/src/lex.dcl
index a713e5d..e78d495 100644 (file)
--- a/src/lex.dcl
+++ b/src/lex.dcl
@@ -1,11 +1,15 @@
 definition module lex
 
 from Data.Either import :: Either
+from yard import :: Error
 
-:: Token :== (Int, Int, TokenValue)
+:: Token = {
+       line :: Int,
+       column :: Int,
+       token :: TokenValue}
 :: TokenValue
        //Value tokens
-       = IdentToken [Char] // Identifier
+       = IdentToken String // Identifier
        | NumberToken Int   // Integer
        | CharToken Char    // Character literal
        //Keyword tokens
@@ -53,6 +57,6 @@ from Data.Either import :: Either
        //Special tokens
        | EndOfFileToken    // EOF
 
-:: LexerOutput :== Either String [Token]
+:: LexerOutput :== Either Error [Token]
 
 lexer :: [Char] -> LexerOutput