projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support the MagicHash extension as a flag and LANGUAGE pragma
[ghc-hetmet.git]
/
compiler
/
parser
/
ParserCoreUtils.hs
diff --git
a/compiler/parser/ParserCoreUtils.hs
b/compiler/parser/ParserCoreUtils.hs
index
4aa3341
..
124294b
100644
(file)
--- a/
compiler/parser/ParserCoreUtils.hs
+++ b/
compiler/parser/ParserCoreUtils.hs
@@
-30,6
+30,7
@@
getCoreModuleName fpath =
(\ _ -> return "Main")
where
findMod [] = "Main"
(\ _ -> return "Main")
where
findMod [] = "Main"
+ -- TODO: this should just return the module name, without the package name
findMod ("%module":m:_) = m
findMod (_:xs) = findMod xs
findMod ("%module":m:_) = m
findMod (_:xs) = findMod xs
@@
-47,6
+48,7
@@
data Token =
| TKcast
| TKnote
| TKexternal
| TKcast
| TKnote
| TKexternal
+ | TKlocal
| TKwild
| TKoparen
| TKcparen
| TKwild
| TKoparen
| TKcparen
@@
-54,7
+56,9
@@
data Token =
| TKcbrace
| TKhash
| TKeq
| TKcbrace
| TKhash
| TKeq
+ | TKcolon
| TKcoloncolon
| TKcoloncolon
+ | TKcoloneqcolon
| TKstar
| TKrarrow
| TKlambda
| TKstar
| TKrarrow
| TKlambda