X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Flex.dcl;h=df25ea88b54b652632d7fbf49d9df4723a45fffd;hb=eb91d7c6b2010be6a43de0a978373654ba3deacc;hp=0b064b44a190cbf3dc33bbfbf675f5c8fe55e8c4;hpb=b4636110ab65f233ed40d4390b62c7799df3c949;p=cc1516.git diff --git a/src/lex.dcl b/src/lex.dcl index 0b064b4..df25ea8 100644 --- a/src/lex.dcl +++ b/src/lex.dcl @@ -2,10 +2,10 @@ definition module lex from Data.Either import :: Either -:: Token :== (Int, TokenValue) +:: Token :== (Int, Int, TokenValue) :: TokenValue //Value tokens - = IdentToken [Char] // Identifier + = IdentToken String // Identifier | NumberToken Int // Integer | CharToken Char // Character literal //Keyword tokens @@ -55,6 +55,4 @@ from Data.Either import :: Either :: LexerOutput :== Either String [Token] -(===) :: TokenValue Token -> Bool - lexer :: [Char] -> LexerOutput