projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment typo
[ghc-hetmet.git]
/
utils
/
hpc
/
HpcLexer.hs
diff --git
a/utils/hpc/HpcLexer.hs
b/utils/hpc/HpcLexer.hs
index
74bec5d
..
3d1a640
100644
(file)
--- a/
utils/hpc/HpcLexer.hs
+++ b/
utils/hpc/HpcLexer.hs
@@
-7,6
+7,7
@@
data Token
| SYM Char
| INT Int
| STR String
| SYM Char
| INT Int
| STR String
+ | CAT String
deriving (Eq,Show)
initLexer :: String -> [Token]
deriving (Eq,Show)
initLexer :: String -> [Token]
@@
-16,6
+17,7
@@
lexer :: String -> Int -> Int -> [(Int,Int,Token)]
lexer (c:cs) line column
| c == '\n' = lexer cs (succ line) 0
| c == '\"' = lexerSTR cs line (succ column)
lexer (c:cs) line column
| c == '\n' = lexer cs (succ line) 0
| c == '\"' = lexerSTR cs line (succ column)
+ | c == '[' = lexerCAT cs "" line (succ column)
| c `elem` "{};-:"
= (line,column,SYM c) : lexer cs line (succ column)
| isSpace c = lexer cs line (succ column)
| c `elem` "{};-:"
= (line,column,SYM c) : lexer cs line (succ column)
| isSpace c = lexer cs line (succ column)
@@
-35,10
+37,15
@@
lexerINT other s line column = (line,column,INT (read s)) : lexer other line co
-- not technically correct for the new column count, but a good approximation.
lexerSTR cs line column
= case lex ('"' : cs) of
-- not technically correct for the new column count, but a good approximation.
lexerSTR cs line column
= case lex ('"' : cs) of
- [(str,rest)] -> (line,succ column,STR str)
+ [(str,rest)] -> (line,succ column,STR (read str))
: lexer rest line (length (show str) + column + 1)
_ -> error "bad string"
: lexer rest line (length (show str) + column + 1)
_ -> error "bad string"
+lexerCAT (c:cs) s line column
+ | c == ']' = (line,column,CAT s) : lexer cs line (succ column)
+ | otherwise = lexerCAT cs (s ++ [c]) line (succ column)
+lexerCAT other s line column = error "lexer failure in CAT"
+
test = do
t <- readFile "EXAMPLE.tc"
print (initLexer t)
test = do
t <- readFile "EXAMPLE.tc"
print (initLexer t)