repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed annote
[cc1516.git]
/
lex.dcl
diff --git
a/lex.dcl
b/lex.dcl
index
438e547
..
46c1713
100644
(file)
--- a/
lex.dcl
+++ b/
lex.dcl
@@
-1,11
+1,13
@@
definition module lex
definition module lex
-import Data.Either
+from Data.Either import :: Either
+from yard import :: Error
+from AST import :: Pos
-:: Token :== (
Int
, TokenValue)
+:: Token :== (
Pos
, TokenValue)
:: TokenValue
//Value tokens
:: TokenValue
//Value tokens
- = IdentToken
[Char]
// Identifier
+ = IdentToken
String
// Identifier
| NumberToken Int // Integer
| CharToken Char // Character literal
//Keyword tokens
| NumberToken Int // Integer
| CharToken Char // Character literal
//Keyword tokens
@@
-29,6
+31,7
@@
import Data.Either
| AmpersandsToken // &&
| PipesToken // ||
| ArrowToken // ->
| AmpersandsToken // &&
| PipesToken // ||
| ArrowToken // ->
+ | EmptyListToken // []
//One character tokens
| BraceOpenToken // (
| BraceCloseToken // )
//One character tokens
| BraceOpenToken // (
| BraceCloseToken // )
@@
-49,9
+52,7
@@
import Data.Either
| LesserToken // <
| BiggerToken // >
| ExclamationToken // !
| LesserToken // <
| BiggerToken // >
| ExclamationToken // !
- //Special tokens
- | EndOfFileToken // EOF
-:: LexerOutput :== Either
String
[Token]
+:: LexerOutput :== Either
Error
[Token]
lexer :: [Char] -> LexerOutput
lexer :: [Char] -> LexerOutput