X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fparser%2FParserCoreUtils.hs;h=2c88aa79e356176379744cdc5cad1ecff5d080ad;hp=a590fb5c9338e2d54a98f33542812a4e26927b3b;hb=d8b99b7e9b2ce9fd8ba97fa10657082ceac09c59;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1 diff --git a/compiler/parser/ParserCoreUtils.hs b/compiler/parser/ParserCoreUtils.hs index a590fb5..2c88aa7 100644 --- a/compiler/parser/ParserCoreUtils.hs +++ b/compiler/parser/ParserCoreUtils.hs @@ -1,6 +1,6 @@ module ParserCoreUtils where -import IO +import System.IO data ParseResult a = OkP a | FailP String type P a = String -> Int -> ParseResult a @@ -30,6 +30,7 @@ getCoreModuleName fpath = (\ _ -> 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 @@ -44,9 +45,10 @@ data Token = | TKin | TKcase | TKof - | TKcoerce + | TKcast | TKnote | TKexternal + | TKlocal | TKwild | TKoparen | TKcparen @@ -54,7 +56,9 @@ data Token = | TKcbrace | TKhash | TKeq + | TKcolon | TKcoloncolon + | TKcoloneqcolon | TKstar | TKrarrow | TKlambda