Commit ca8ac1f2 authored by mnislaih's avatar mnislaih

Fix import lists

parent fff08925
...@@ -10,7 +10,6 @@ module Desugar ( deSugar, deSugarExpr ) where ...@@ -10,7 +10,6 @@ module Desugar ( deSugar, deSugarExpr ) where
#include "HsVersions.h" #include "HsVersions.h"
import Breakpoints
import DynFlags import DynFlags
import StaticFlags import StaticFlags
import HscTypes import HscTypes
......
...@@ -14,45 +14,42 @@ module DsBreakpoint( ...@@ -14,45 +14,42 @@ module DsBreakpoint(
, mkBreakpointExpr , mkBreakpointExpr
) where ) where
import IOEnv ( ioToIOEnv ) import IOEnv
import TysPrim ( alphaTyVar ) import TysPrim
import TysWiredIn ( intTy, stringTy, mkTupleTy, mkListTy, boolTy ) import TysWiredIn
import PrelNames import PrelNames
import Module ( moduleName, moduleNameFS, modulePackageId ) import Module
import PackageConfig ( packageIdFS) import PackageConfig
import SrcLoc ( SrcLoc, Located(..), SrcSpan, srcSpanFile, import SrcLoc
noLoc, noSrcLoc, isGoodSrcSpan, import TyCon
srcLocLine, srcLocCol, srcSpanStart ) import TypeRep
import TyCon ( isUnLiftedTyCon, tyConDataCons )
import TypeRep ( Type(..) )
import DataCon import DataCon
import Type import Type
import MkId ( unsafeCoerceId, lazyId ) import MkId
import Name ( Name, mkInternalName ) import Name
import Var ( mkTyVar ) import Var
import Id ( Id, idType, mkGlobalId, idName ) import Id
import IdInfo ( vanillaIdInfo, GlobalIdDetails (VanillaGlobal) ) import IdInfo
import BasicTypes ( Boxity(Boxed) ) import BasicTypes
import OccName ( mkOccName, tvName ) import OccName
import TcRnMonad import TcRnMonad
import HsSyn import HsSyn
import HsLit ( HsLit(HsString, HsInt) ) import HsLit
import CoreSyn ( CoreExpr, Expr (App) ) import CoreSyn
import CoreUtils ( exprType ) import CoreUtils
import Outputable import Outputable
import ErrUtils ( debugTraceMsg ) import ErrUtils
import FastString ( mkFastString, unpackFS ) import FastString
import DynFlags ( GhcMode(..), DynFlag(..) ) import DynFlags
import DsMonad import DsMonad
import {-#SOURCE#-}DsExpr ( dsLExpr ) import {-#SOURCE#-}DsExpr ( dsLExpr )
import Control.Monad import Control.Monad
import Data.IORef import Data.IORef
import Foreign.StablePtr ( newStablePtr, castStablePtrToPtr ) import Foreign.StablePtr
import GHC.Exts ( Ptr(..), Int(..), addr2Int#, unsafeCoerce# ) import GHC.Exts
mkBreakpointExpr :: SrcSpan -> Id -> DsM (LHsExpr Id) mkBreakpointExpr :: SrcSpan -> Id -> DsM (LHsExpr Id)
mkBreakpointExpr loc bkptFuncId = do mkBreakpointExpr loc bkptFuncId = do
...@@ -132,7 +129,7 @@ dynBreakpoint :: SrcSpan -> DsM (LHsExpr Id) ...@@ -132,7 +129,7 @@ dynBreakpoint :: SrcSpan -> DsM (LHsExpr Id)
dynBreakpoint loc | not (isGoodSrcSpan loc) = dynBreakpoint loc | not (isGoodSrcSpan loc) =
pprPanic "dynBreakpoint" (ppr loc) pprPanic "dynBreakpoint" (ppr loc)
dynBreakpoint loc = do dynBreakpoint loc = do
let autoBreakpoint = mkGlobalId VanillaGlobal breakpointAutoName let autoBreakpoint = Id.mkGlobalId VanillaGlobal breakpointAutoName
breakpointAutoTy vanillaIdInfo breakpointAutoTy vanillaIdInfo
dflags <- getDOptsDs dflags <- getDOptsDs
ioToIOEnv$ debugTraceMsg dflags 3 (text "Breakpoint inserted at " <> ppr loc) ioToIOEnv$ debugTraceMsg dflags 3 (text "Breakpoint inserted at " <> ppr loc)
...@@ -173,7 +170,7 @@ mkJumpFunc bkptFuncId ...@@ -173,7 +170,7 @@ mkJumpFunc bkptFuncId
(TyVarTy tyvar)))))))) (TyVarTy tyvar))))))))
build name extra = do build name extra = do
ATyCon opaqueTyCon <- dsLookupGlobal opaqueTyConName ATyCon opaqueTyCon <- dsLookupGlobal opaqueTyConName
return$ mkGlobalId VanillaGlobal name return$ Id.mkGlobalId VanillaGlobal name
(basicType extra (mkTyConApp opaqueTyCon [])) vanillaIdInfo (basicType extra (mkTyConApp opaqueTyCon [])) vanillaIdInfo
mkTupleType tys = mkTupleTy Boxed (length tys) tys mkTupleType tys = mkTupleTy Boxed (length tys) tys
......
...@@ -28,7 +28,6 @@ import ByteCodeLink ...@@ -28,7 +28,6 @@ import ByteCodeLink
import ByteCodeItbls import ByteCodeItbls
import ByteCodeAsm import ByteCodeAsm
import RtClosureInspect import RtClosureInspect
import Var
import IfaceEnv import IfaceEnv
import Config import Config
import OccName import OccName
...@@ -63,7 +62,6 @@ import Control.Arrow ( second ) ...@@ -63,7 +62,6 @@ import Control.Arrow ( second )
import Data.IORef import Data.IORef
import Data.List import Data.List
import Foreign.Ptr import Foreign.Ptr
import GHC.Exts
import System.IO import System.IO
import System.Directory import System.Directory
......
...@@ -50,22 +50,18 @@ import HscTypes ( HscEnv ) ...@@ -50,22 +50,18 @@ import HscTypes ( HscEnv )
import DataCon import DataCon
import Type import Type
import TcRnMonad import TcRnMonad ( TcM, initTcPrintErrors, ioToTcRn, recoverM, writeMutVar )
import TcType import TcType
import TcMType import TcMType
import TcUnify import TcUnify
import TcGadt import TcGadt
import DriverPhases
import TyCon import TyCon
import Var import Var
import Name import Name
import VarEnv
import OccName
import VarSet
import Unique import Unique
import UniqSupply
import Var ( setVarUnique, mkTyVar, tyVarKind, setTyVarKind )
import VarEnv ( mkVarEnv )
import OccName ( emptyTidyOccEnv )
import VarSet ( VarSet, mkVarSet, varSetElems, unionVarSets )
import Unique ( getUnique, incrUnique )
import {-#SOURCE#-} TcRnDriver ( tcRnRecoverDataCon ) import {-#SOURCE#-} TcRnDriver ( tcRnRecoverDataCon )
import TysPrim import TysPrim
...@@ -73,7 +69,6 @@ import PrelNames ...@@ -73,7 +69,6 @@ import PrelNames
import TysWiredIn import TysWiredIn
import Constants ( wORD_SIZE ) import Constants ( wORD_SIZE )
import FastString ( mkFastString )
import Outputable import Outputable
import Maybes import Maybes
import Panic import Panic
...@@ -85,12 +80,11 @@ import GHC.Exts ...@@ -85,12 +80,11 @@ import GHC.Exts
import GHC.Int ( Int32(..), Int64(..) ) import GHC.Int ( Int32(..), Int64(..) )
import GHC.Word ( Word32(..), Word64(..) ) import GHC.Word ( Word32(..), Word64(..) )
import Control.Monad ( liftM, liftM2, msum ) import Control.Monad
import Data.Maybe import Data.Maybe
import Data.Array.Base import Data.Array.Base
import Data.List ( partition ) import Data.List ( partition )
import Foreign.Storable import Foreign.Storable
import Foreign ( unsafePerformIO )
--------------------------------------------- ---------------------------------------------
-- * A representation of semi evaluated Terms -- * A representation of semi evaluated Terms
......
...@@ -18,7 +18,7 @@ import Name ...@@ -18,7 +18,7 @@ import Name
import Var ( Id ) import Var ( Id )
import PrelNames import PrelNames
import GHC.Exts ( unsafeCoerce# ) import GHC.Exts
#ifdef GHCI #ifdef GHCI
data BkptHandler a = BkptHandler { data BkptHandler a = BkptHandler {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment