X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FParseIface.y;h=c83a0f82f1b13040ba539f5ae86012497058e570;hb=17879095049f5705c9734cab4f4c5d56f61f81a7;hp=f9ebbd13739b14a81dc36e3d94c1e19d3fd9d80d;hpb=dbb27b50948726c09fae681bca921ba3c00d859b;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/ParseIface.y b/ghc/compiler/rename/ParseIface.y index f9ebbd1..c83a0f8 100644 --- a/ghc/compiler/rename/ParseIface.y +++ b/ghc/compiler/rename/ParseIface.y @@ -49,10 +49,11 @@ import IdInfo ( exactArity, InlinePragInfo(..) ) import PrimOp ( CCall(..), CCallTarget(..) ) import Lex -import RnMonad ( ImportVersion, ParsedIface(..), WhatsImported(..), - ExportItem, RdrAvailInfo, GenAvailInfo(..), - WhetherHasOrphans, IsBootInterface - ) +import RnMonad ( ParsedIface(..) ) +import HscTypes ( WhetherHasOrphans, IsBootInterface, GenAvailInfo(..), + ImportVersion, ExportItem, WhatsImported(..), + RdrAvailInfo ) + import RdrName ( RdrName, mkRdrUnqual, mkSysQual, mkSysUnqual ) import Name ( OccName ) import OccName ( mkSysOccFS, @@ -246,7 +247,7 @@ import_part : { [] } import_decl :: { ImportVersion OccName } import_decl : 'import' mod_name orphans is_boot whats_imported ';' - { (mkSysModuleNameFS $2, $3, $4, $5) } + { ({-mkSysModuleNameFS-} $2, $3, $4, $5) } orphans :: { WhetherHasOrphans } orphans : { False } @@ -275,7 +276,7 @@ name_version_pair : var_occ version { ($1, $2) } exports_part :: { [ExportItem] } exports_part : { [] } | '__export' mod_name entities ';' - exports_part { (mkSysModuleNameFS $2, $3) : $5 } + exports_part { ({-mkSysModuleNameFS-} $2, $3) : $5 } entities :: { [RdrAvailInfo] } entities : { [] }