X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Ftypecheck%2FTcDeriv.lhs;h=c93795707008f2b4657b5c820114bdbe7d8cfa8c;hb=f7ecf7234c224489be8a5e63fced903b655d92ee;hp=e699cc0695d9d854040cec6c67ee194904158ffb;hpb=ae45ff0e9831a0dc862a5d68d03e355d7e323c62;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs
index e699cc0..c937957 100644
--- a/ghc/compiler/typecheck/TcDeriv.lhs
+++ b/ghc/compiler/typecheck/TcDeriv.lhs
@@ -16,26 +16,27 @@ import HsSyn		( FixityDecl, Sig, HsBinds(..), Bind(..), MonoBinds(..),
 			  GRHSsAndBinds, Match, HsExpr, HsLit, InPat,
 			  ArithSeqInfo, Fake, MonoType )
 import HsPragmas	( InstancePragmas(..) )
-import RnHsSyn		( mkRnName, RnName(..), RenamedHsBinds(..), RenamedFixityDecl(..) )
+import RnHsSyn		( mkRnName, RnName(..), SYN_IE(RenamedHsBinds), RenamedFixityDecl(..) )
 import TcHsSyn		( TcIdOcc )
 
 import TcMonad
-import Inst		( InstanceMapper(..) )
+import Inst		( SYN_IE(InstanceMapper) )
 import TcEnv		( getEnv_TyCons, tcLookupClassByKey )
+import SpecEnv		( SpecEnv )
 import TcKind		( TcKind )
 import TcGenDeriv	-- Deriv stuff
 import TcInstUtil	( InstInfo(..), mkInstanceRelatedIds, buildInstanceEnvs )
 import TcSimplify	( tcSimplifyThetas )
 
 import RnMonad
-import RnUtils		( RnEnv(..), extendGlobalRnEnv )
+import RnUtils		( SYN_IE(RnEnv), extendGlobalRnEnv )
 import RnBinds		( rnMethodBinds, rnTopBinds )
 
-import Bag		( emptyBag{-ToDo:rm-}, Bag, isEmptyBag, unionBags, listToBag )
+import Bag		( Bag, isEmptyBag, unionBags, listToBag )
 import Class		( classKey, needsDataDeclCtxtClassKeys, GenClass )
-import ErrUtils		( pprBagOfErrors, addErrLoc, Error(..) )
+import ErrUtils		( pprBagOfErrors, addErrLoc, SYN_IE(Error) )
 import Id		( dataConArgTys, isNullaryDataCon, mkDictFunId )
-import Maybes		( maybeToBool, Maybe(..) )
+import Maybes		( maybeToBool )
 import Name		( isLocallyDefined, getSrcLoc,
 			  mkTopLevName, origName, mkImplicitName, ExportFlag(..),
 			  RdrName(..), Name{--O only-}
@@ -43,15 +44,15 @@ import Name		( isLocallyDefined, getSrcLoc,
 import Outputable	( Outputable(..){-instances e.g., (,)-} )
 import PprType		( GenType, GenTyVar, GenClass, TyCon )
 import PprStyle		( PprStyle(..) )
-import Pretty		( ppAbove, ppAboves, ppCat, ppBesides, ppStr, ppHang, Pretty(..) )
-import Pretty--ToDo:rm
-import FiniteMap--ToDo:rm
+import Pretty		( ppAbove, ppAboves, ppCat, ppBesides, ppStr, ppHang, SYN_IE(Pretty) )
+--import Pretty--ToDo:rm
+--import FiniteMap--ToDo:rm
 import SrcLoc		( mkGeneratedSrcLoc, SrcLoc )
 import TyCon		( tyConTyVars, tyConDataCons, tyConDerivings,
 			  tyConTheta, maybeTyConSingleCon,
 			  isEnumerationTyCon, isDataTyCon, TyCon
 			)
-import Type		( GenType(..), TauType(..), mkTyVarTys, applyTyCon,
+import Type		( GenType(..), SYN_IE(TauType), mkTyVarTys, applyTyCon,
 			  mkSigmaTy, mkDictTy, isPrimType, instantiateTy,
 			  getAppDataTyCon, getAppTyCon
 			)
@@ -60,8 +61,8 @@ import TyVar		( GenTyVar )
 import UniqFM		( emptyUFM )
 import Unique		-- Keys stuff
 import Util		( zipWithEqual, zipEqual, sortLt, removeDups,  assoc,
-			  thenCmp, cmpList, panic, pprPanic, pprPanic#,
-			  assertPanic, pprTrace{-ToDo:rm-}
+			  thenCmp, cmpList, panic, panic#, pprPanic, pprPanic#,
+			  assertPanic-- , pprTrace{-ToDo:rm-}
 			)
 \end{code}
 
@@ -438,7 +439,7 @@ solveDerivEqns inst_decl_infos_in orig_eqns
 	  = (tv1 `cmp` tv2) `thenCmp` (c1 `cmp` c2)
 #ifdef DEBUG
 	cmp_rhs other_1 other_2
-	  = pprPanic# "tcDeriv:cmp_rhs:" (ppCat [ppr PprDebug other_1, ppr PprDebug other_2])
+	  = panic# "tcDeriv:cmp_rhs:" --(ppCat [ppr PprDebug other_1, ppr PprDebug other_2])
 #endif
 
 \end{code}
@@ -489,7 +490,7 @@ add_solns inst_infos_in eqns solns
 		-- We can't leave it as a panic because to get the theta part we
 		-- have to run down the type!
 
-	my_panic str = pprPanic ("add_soln:"++str) (ppCat [ppChar ':', ppr PprDebug clas, ppr PprDebug tycon])
+	my_panic str = panic "add_soln" -- pprPanic ("add_soln:"++str) (ppCat [ppChar ':', ppr PprDebug clas, ppr PprDebug tycon])
 \end{code}
 
 %************************************************************************
@@ -610,8 +611,9 @@ gen_inst_info modname fixities deriver_rn_env
     )			`thenNF_Tc` \ (mbinds, errs) ->
 
     if not (isEmptyBag errs) then
-	pprPanic "gen_inst_info:renamer errs!\n"
-		 (ppAbove (pprBagOfErrors PprDebug errs) (ppr PprDebug proto_mbinds))
+	panic "gen_inst_info:renamer errs!\n"
+--	pprPanic "gen_inst_info:renamer errs!\n"
+--		 (ppAbove (pprBagOfErrors PprDebug errs) (ppr PprDebug proto_mbinds))
     else
 	-- All done
     let
@@ -680,8 +682,9 @@ gen_tag_n_con_binds rn_env nm_alist_etc
     )			`thenNF_Tc` \ (binds, errs) ->
 
     if not (isEmptyBag errs) then
-	pprPanic "gen_tag_n_con_binds:renamer errs!\n"
-		 (ppAbove (pprBagOfErrors PprDebug errs) (ppr PprDebug binds))
+	panic "gen_tag_n_con_binds:renamer errs!\n"
+--	pprPanic "gen_tag_n_con_binds:renamer errs!\n"
+--		 (ppAbove (pprBagOfErrors PprDebug errs) (ppr PprDebug binds))
     else
 	returnTc (binds, deriver_rn_env)
 \end{code}