X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FInst.lhs;h=6b8a7afbe2a35b662ffd32ae56d589240df88ece;hb=f7ecf7234c224489be8a5e63fced903b655d92ee;hp=d33c7a74d1d06bbd4a79984e52a6680cdd843fe8;hpb=26741ec416bae2c502ef00a2ba0e79050a32cb67;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs
index d33c7a7..6b8a7af 100644
--- a/ghc/compiler/typecheck/Inst.lhs
+++ b/ghc/compiler/typecheck/Inst.lhs
@@ -10,9 +10,9 @@ module Inst (
 	Inst(..), 	-- Visible only to TcSimplify
 
 	InstOrigin(..), OverloadedLit(..),
-	LIE(..), emptyLIE, unitLIE, plusLIE, consLIE, zonkLIE, plusLIEs,
+	SYN_IE(LIE), emptyLIE, unitLIE, plusLIE, consLIE, zonkLIE, plusLIEs,
 
-        InstanceMapper(..),
+        SYN_IE(InstanceMapper),
 
 	newDicts, newDictsAtLoc, newMethod, newMethodWithGivenTy, newOverloadedLit,
 
@@ -29,33 +29,35 @@ module Inst (
     ) where
 
 IMP_Ubiq()
+IMPORT_1_3(Ratio(Rational))
 
 import HsSyn	( HsLit(..), HsExpr(..), HsBinds, 
 		  InPat, OutPat, Stmt, Qualifier, Match,
 		  ArithSeqInfo, PolyType, Fake )
-import RnHsSyn	( RenamedArithSeqInfo(..), RenamedHsExpr(..) )
-import TcHsSyn	( TcIdOcc(..), TcExpr(..), TcIdBndr(..),
+import RnHsSyn	( SYN_IE(RenamedArithSeqInfo), SYN_IE(RenamedHsExpr),
+		  RnName{-instance NamedThing-}
+		)
+import TcHsSyn	( TcIdOcc(..), SYN_IE(TcExpr), SYN_IE(TcIdBndr),
 		  mkHsTyApp, mkHsDictApp, tcIdTyVars )
 
 import TcMonad	hiding ( rnMtoTcM )
 import TcEnv	( tcLookupGlobalValueByKey, tcLookupTyConByKey )
-import TcType	( TcType(..), TcRhoType(..), TcMaybe, TcTyVarSet(..),
+import TcType	( SYN_IE(TcType), SYN_IE(TcRhoType), TcMaybe, SYN_IE(TcTyVarSet),
 		  tcInstType, zonkTcType )
 
 import Bag	( emptyBag, unitBag, unionBags, unionManyBags, listToBag, consBag )
 import Class	( isCcallishClass, isNoDictClass, classInstEnv,
-		  SYN_IE(Class), GenClass, SYN_IE(ClassInstEnv)
+		  SYN_IE(Class), GenClass, SYN_IE(ClassInstEnv), SYN_IE(ClassOp)
 		)
 import ErrUtils ( addErrLoc, SYN_IE(Error) )
 import Id	( GenId, idType, mkInstId )
 import MatchEnv	( lookupMEnv, insertMEnv )
 import Name	( mkLocalName, getLocalName, Name )
 import Outputable
-import PprType	( GenClass, TyCon, GenType, GenTyVar )	
+import PprType	( GenClass, TyCon, GenType, GenTyVar, pprParendGenType )	
 import PprStyle	( PprStyle(..) )
 import Pretty
-import RnHsSyn	( RnName{-instance NamedThing-} )
-import SpecEnv	( SYN_IE(SpecEnv) )
+import SpecEnv	( SpecEnv )
 import SrcLoc	( SrcLoc, mkUnknownSrcLoc )
 import Type	( GenType, eqSimpleTy, instantiateTy,
 		  isTyVarTy, mkDictTy, splitForAllTy, splitSigmaTy,
@@ -362,7 +364,7 @@ ppr_inst sty hdr ppr_orig (LitInst u lit ty orig loc)
 
 ppr_inst sty hdr ppr_orig (Dict u clas ty orig loc)
   = ppHang (ppr_orig orig loc)
-	 4 (ppCat [ppr sty clas, ppr sty ty, show_uniq sty u])
+	 4 (ppCat [ppr sty clas, pprParendGenType sty ty, show_uniq sty u])
 
 ppr_inst sty hdr ppr_orig (Method u id tys rho orig loc)
   = ppHang (ppr_orig orig loc)