X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=9e1bfb97a5bd9e28cb1ee0e1f97f58ceb5e3f5e8;hb=7121d8296720cf1a79259350f361f5771210b23d;hp=8aeab69080d9a1b6a8baf2577b66aaa183982d24;hpb=dfcf88523ec5988fbcaa2cbf812cc5862ad621cf;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs index 8aeab69..9e1bfb9 100644 --- a/compiler/typecheck/TcRnDriver.lhs +++ b/compiler/typecheck/TcRnDriver.lhs @@ -48,7 +48,8 @@ import TcRules ( tcRules ) import TcForeign ( tcForeignImports, tcForeignExports ) import TcInstDcls ( tcInstDecls1, tcInstDecls2 ) import TcIface ( tcExtCoreBindings, tcHiBootIface ) -import IfaceSyn ( checkBootDecl, tyThingToIfaceDecl, IfaceExtName(..) ) +import MkIface ( tyThingToIfaceDecl ) +import IfaceSyn ( checkBootDecl, IfaceExtName(..) ) import TcSimplify ( tcSimplifyTop ) import TcTyClsDecls ( tcTyAndClassDecls ) import LoadIface ( loadOrphanModules ) @@ -99,6 +100,7 @@ import TcSimplify ( tcSimplifyInteractive, tcSimplifyInfer ) import TcType ( Type, mkForAllTys, mkFunTys, mkTyConApp, tyVarsOfType, isTauTy, isUnLiftedType, tyClsNamesOfDFunHead, tyClsNamesOfType, isUnitTy ) import TcEnv ( tcLookupTyCon, tcLookupId, tcLookupGlobal ) +import TypeRep ( TyThing(..) ) import RnTypes ( rnLHsType ) import Inst ( tcGetInstEnvs ) import InstEnv ( classInstances, instEnvElts ) @@ -113,7 +115,7 @@ import TysWiredIn ( mkListTy, unitTy ) import IdInfo ( GlobalIdDetails(..) ) import Kind ( Kind ) import Var ( globaliseId ) -import Name ( nameModule, isBuiltInSyntax, isInternalName ) +import Name ( isBuiltInSyntax, isInternalName ) import OccName ( isTcOcc ) import NameEnv ( delListFromNameEnv ) import PrelNames ( iNTERACTIVE, ioTyConName, printName, itName, @@ -123,13 +125,14 @@ import HscTypes ( InteractiveContext(..), Dependencies(..) ) import BasicTypes ( Fixity, RecFlag(..) ) import SrcLoc ( unLoc ) +import Data.Maybe ( isNothing ) #endif import FastString ( mkFastString ) import Util ( sortLe ) import Bag ( unionBags, snocBag, emptyBag, unitBag, unionManyBags ) -import Data.Maybe ( isJust, isNothing ) +import Data.Maybe ( isJust ) \end{code} @@ -426,6 +429,7 @@ tc_rn_src_decls boot_details ds -- Rename the splice expression, and get its supporting decls (rn_splice_expr, splice_fvs) <- rnLExpr splice_expr ; failIfErrsM ; -- Don't typecheck if renaming failed + rnDump (ppr rn_splice_expr) ; -- Execute the splice spliced_decls <- tcSpliceDecls rn_splice_expr ;