From: simonpj <unknown>
Date: Mon, 19 Dec 2005 13:08:19 +0000 (+0000)
Subject: [project @ 2005-12-19 13:08:19 by simonpj]
X-Git-Tag: final_switch_to_darcs,_this_repo_is_now_live~79
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=50ba9193661adc3bdcfce5bd1a22045e2c6e4783;hp=98a12ec1d00cdeca31a52374aba76e0a13a79ff7;p=ghc-hetmet.git

[project @ 2005-12-19 13:08:19 by simonpj]
Wibble to printing FunTyCon in GHCi that makes :b GHC.Base work
---

diff --git a/ghc/compiler/main/GHC.hs b/ghc/compiler/main/GHC.hs
index 2ff5229..85595a7 100644
--- a/ghc/compiler/main/GHC.hs
+++ b/ghc/compiler/main/GHC.hs
@@ -97,7 +97,7 @@ module GHC (
 	-- ** Type constructors
 	TyCon, 
 	tyConTyVars, tyConDataCons, tyConArity,
-	isClassTyCon, isSynTyCon, isNewTyCon, isPrimTyCon,
+	isClassTyCon, isSynTyCon, isNewTyCon, isPrimTyCon, isFunTyCon,
 	getSynTyConDefn,
 
 	-- ** Type variables
@@ -191,7 +191,7 @@ import Id		( Id, idType, isImplicitId, isDeadBinder,
 import Var		( TyVar )
 import TysPrim		( alphaTyVars )
 import TyCon		( TyCon, isClassTyCon, isSynTyCon, isNewTyCon,
-			  isPrimTyCon, tyConArity,
+			  isPrimTyCon, isFunTyCon, tyConArity,
 			  tyConTyVars, tyConDataCons, getSynTyConDefn )
 import Class		( Class, classSCTheta, classTvsFds, classMethods )
 import FunDeps		( pprFundeps )
@@ -219,21 +219,19 @@ import FiniteMap
 import Panic
 import Digraph
 import Bag		( unitBag )
-import ErrUtils		( Severity(..), showPass, Messages, fatalErrorMsg, debugTraceMsg,
+import ErrUtils		( Severity(..), showPass, fatalErrorMsg, debugTraceMsg,
 			  mkPlainErrMsg, printBagOfErrors, printErrorsAndWarnings )
 import qualified ErrUtils
-import PrelNames	( mAIN )
 import Util
 import StringBuffer	( StringBuffer, hGetStringBuffer )
 import Outputable
 import SysTools		( cleanTempFilesExcept )
 import BasicTypes
 import TcType           ( tcSplitSigmaTy, isDictTy )
-import FastString	( mkFastString )
 
 import Directory        ( getModificationTime, doesFileExist )
 import Maybe		( isJust, isNothing, fromJust )
-import Maybes		( orElse, expectJust, mapCatMaybes )
+import Maybes		( expectJust, mapCatMaybes )
 import List		( partition, nub )
 import qualified List
 import Monad		( unless, when )
diff --git a/ghc/compiler/main/PprTyThing.hs b/ghc/compiler/main/PprTyThing.hs
index ecf6947..ed4cd5c 100644
--- a/ghc/compiler/main/PprTyThing.hs
+++ b/ghc/compiler/main/PprTyThing.hs
@@ -67,7 +67,8 @@ pprTyThingHdr exts (AClass cls)       = pprClassHdr   exts cls
 pprTyConHdr exts tyCon =
   ptext keyword <+> ppr_bndr tyCon <+> hsep (map ppr vars)
   where
-    vars | GHC.isPrimTyCon tyCon = take (GHC.tyConArity tyCon) GHC.alphaTyVars
+    vars | GHC.isPrimTyCon tyCon || 
+	   GHC.isFunTyCon tyCon = take (GHC.tyConArity tyCon) GHC.alphaTyVars
 	 | otherwise = GHC.tyConTyVars tyCon
 
     keyword | GHC.isSynTyCon tyCon = SLIT("type")