From: simonpj Date: Thu, 27 Mar 2003 08:17:59 +0000 (+0000) Subject: [project @ 2003-03-27 08:16:29 by simonpj] X-Git-Tag: Approx_11550_changesets_converted~1023 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e9440920bbcd7487eeab42972a648a401a519873;p=ghc-hetmet.git [project @ 2003-03-27 08:16:29 by simonpj] Import wibbles --- diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs index fc21ca1..ce020f6 100644 --- a/ghc/compiler/typecheck/Inst.lhs +++ b/ghc/compiler/typecheck/Inst.lhs @@ -39,7 +39,7 @@ module Inst ( import {-# SOURCE #-} TcExpr( tcExpr ) import HsSyn ( HsLit(..), HsOverLit(..), HsExpr(..) ) -import TcHsSyn ( TcExpr, TcId, TcIdSet, TypecheckedHsExpr, +import TcHsSyn ( TcExpr, TcId, TcIdSet, mkHsTyApp, mkHsDictApp, mkHsConApp, zonkId, mkCoercion, ExprCoFn ) @@ -52,7 +52,7 @@ import TcMType ( zonkTcType, zonkTcTypes, zonkTcPredType, zapToType, import TcType ( Type, TcType, TcThetaType, TcTyVarSet, SourceType(..), PredType, TyVarDetails(VanillaTv), tcSplitForAllTys, tcSplitForAllTys, mkTyConApp, - tcSplitMethodTy, tcSplitPhiTy, mkGenTyConApp, + tcSplitPhiTy, mkGenTyConApp, isIntTy,isFloatTy, isIntegerTy, isDoubleTy, tcIsTyVarTy, mkPredTy, mkTyVarTy, mkTyVarTys, tyVarsOfType, tyVarsOfTypes, tyVarsOfPred, tidyPred, diff --git a/ghc/compiler/typecheck/TcIfaceSig.lhs b/ghc/compiler/typecheck/TcIfaceSig.lhs index 4b34990..e1d3230 100644 --- a/ghc/compiler/typecheck/TcIfaceSig.lhs +++ b/ghc/compiler/typecheck/TcIfaceSig.lhs @@ -28,7 +28,7 @@ import CoreUnfold import CoreLint ( lintUnfolding ) import WorkWrap ( mkWrapper ) -import Id ( Id, mkVanillaGlobal, mkLocalId, idInfo ) +import Id ( Id, mkVanillaGlobal, mkLocalId ) import MkId ( mkFCallId ) import IdInfo import TyCon ( tyConDataCons, tyConTyVars ) diff --git a/ghc/compiler/typecheck/TcUnify.lhs b/ghc/compiler/typecheck/TcUnify.lhs index 1a05fd5..cea0796 100644 --- a/ghc/compiler/typecheck/TcUnify.lhs +++ b/ghc/compiler/typecheck/TcUnify.lhs @@ -20,7 +20,7 @@ module TcUnify ( import HsSyn ( HsExpr(..) ) -import TcHsSyn ( TypecheckedHsExpr, TcPat, mkHsLet, +import TcHsSyn ( mkHsLet, ExprCoFn, idCoercion, isIdCoercion, mkCoercion, (<.>), (<$>) ) import TypeRep ( Type(..), SourceType(..), TyNote(..), openKindCon ) @@ -37,7 +37,6 @@ import TcType ( TcKind, TcType, TcSigmaType, TcRhoType, TcTyVar, TcTauType, eqKind, openTypeKind, liftedTypeKind, isTypeKind, mkArrowKind, hasMoreBoxityInfo, allDistinctTyVars ) -import qualified Type ( getTyVar_maybe ) import Inst ( newDicts, instToId, tcInstCall ) import TcMType ( getTcTyVar, putTcTyVar, tcInstType, readHoleResult, newKindVar, newTyVarTy, newTyVarTys, newOpenTypeKind, newHoleTyVarTy, @@ -55,7 +54,6 @@ import Name ( isSystemName ) import ErrUtils ( Message ) import BasicTypes ( Boxity, Arity, isBoxed ) import Util ( equalLength, notNull ) -import Maybe ( isNothing ) import Outputable \end{code}