repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
werkt
[cc1516.git]
/
lex.dcl
diff --git
a/lex.dcl
b/lex.dcl
index
d6c421c
..
a887374
100644
(file)
--- a/
lex.dcl
+++ b/
lex.dcl
@@
-1,11
+1,12
@@
definition module lex
definition module lex
-
import Data.
Either
+
from Data.Either import ::
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
@@
-21,6
+22,7
@@
import Data.Either
| BoolTypeToken // Bool keyword
//Two character tokens
| DoubleColonToken // ::
| BoolTypeToken // Bool keyword
//Two character tokens
| DoubleColonToken // ::
+ | NotEqualToken // !=
| LesserEqToken // <=
| GreaterEqToken // >=
| EqualsToken // ==
| LesserEqToken // <=
| GreaterEqToken // >=
| EqualsToken // ==
@@
-52,6
+54,4
@@
import Data.Either
:: LexerOutput :== Either String [Token]
:: LexerOutput :== Either String [Token]
-instance toString LexerOutput
-
lexer :: [Char] -> LexerOutput
lexer :: [Char] -> LexerOutput