repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed numbertoken to Int
[cc1516.git]
/
lex.dcl
diff --git
a/lex.dcl
b/lex.dcl
index
d1daf7c
..
438e547
100644
(file)
--- a/
lex.dcl
+++ b/
lex.dcl
@@
-2,10
+2,11
@@
definition module lex
import Data.Either
import Data.Either
-:: Token
+:: Token :== (Int, TokenValue)
+:: TokenValue
//Value tokens
= IdentToken [Char] // Identifier
//Value tokens
= IdentToken [Char] // Identifier
- | NumberToken
[Char]
// Integer
+ | NumberToken
Int
// Integer
| CharToken Char // Character literal
//Keyword tokens
| VarToken // var keyword
| CharToken Char // Character literal
//Keyword tokens
| VarToken // var keyword
@@
-53,6
+54,4
@@
import Data.Either
:: LexerOutput :== Either String [Token]
:: LexerOutput :== Either String [Token]
-instance toString LexerOutput
-
lexer :: [Char] -> LexerOutput
lexer :: [Char] -> LexerOutput