repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CheckIf statements
[cc1516.git]
/
lex.dcl
diff --git
a/lex.dcl
b/lex.dcl
index
d6c421c
..
46c1713
100644
(file)
--- a/
lex.dcl
+++ b/
lex.dcl
@@
-1,11
+1,14
@@
definition module lex
definition module lex
-import Data.Either
+from Data.Either import :: Either
+from yard import :: Error
+from AST import :: Pos
-:: Token
+:: Token :== (Pos, TokenValue)
+:: TokenValue
//Value tokens
//Value tokens
- = IdentToken
[Char]
// Identifier
- | NumberToken
[Char]
// Integer
+ = IdentToken
String
// Identifier
+ | NumberToken
Int
// Integer
| CharToken Char // Character literal
//Keyword tokens
| VarToken // var keyword
| CharToken Char // Character literal
//Keyword tokens
| VarToken // var keyword
@@
-21,12
+24,14
@@
import Data.Either
| BoolTypeToken // Bool keyword
//Two character tokens
| DoubleColonToken // ::
| BoolTypeToken // Bool keyword
//Two character tokens
| DoubleColonToken // ::
+ | NotEqualToken // !=
| LesserEqToken // <=
| GreaterEqToken // >=
| EqualsToken // ==
| AmpersandsToken // &&
| PipesToken // ||
| ArrowToken // ->
| LesserEqToken // <=
| GreaterEqToken // >=
| EqualsToken // ==
| AmpersandsToken // &&
| PipesToken // ||
| ArrowToken // ->
+ | EmptyListToken // []
//One character tokens
| BraceOpenToken // (
| BraceCloseToken // )
//One character tokens
| BraceOpenToken // (
| BraceCloseToken // )
@@
-47,11
+52,7
@@
import Data.Either
| LesserToken // <
| BiggerToken // >
| ExclamationToken // !
| LesserToken // <
| BiggerToken // >
| ExclamationToken // !
- //Special tokens
- | EndOfFileToken // EOF
-:: LexerOutput :== Either String [Token]
-
-instance toString LexerOutput
+:: LexerOutput :== Either Error [Token]
lexer :: [Char] -> LexerOutput
lexer :: [Char] -> LexerOutput