repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
envs files gemaakt, geen sapl meer(eindelijk), readme
[cc1516.git]
/
src
/
lex.dcl
diff --git
a/src/lex.dcl
b/src/lex.dcl
index
0b064b4
..
e78d495
100644
(file)
--- a/
src/lex.dcl
+++ b/
src/lex.dcl
@@
-1,11
+1,15
@@
definition module lex
from Data.Either import :: Either
definition module lex
from Data.Either import :: Either
+from yard import :: Error
-:: Token :== (Int, TokenValue)
+:: Token = {
+ line :: Int,
+ column :: Int,
+ token :: 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
@@
-53,8
+57,6
@@
from Data.Either import :: Either
//Special tokens
| EndOfFileToken // EOF
//Special tokens
| EndOfFileToken // EOF
-:: LexerOutput :== Either String [Token]
-
-(===) :: TokenValue Token -> Bool
+:: LexerOutput :== Either Error [Token]
lexer :: [Char] -> LexerOutput
lexer :: [Char] -> LexerOutput