From: igloo <unknown>
Date: Mon, 5 Jan 2004 15:15:27 +0000 (+0000)
Subject: [project @ 2004-01-05 15:15:26 by igloo]
X-Git-Tag: Approx_11550_changesets_converted~149
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=1b1d826f356b5a1d4b05da46e3db8a1f70c9db2a;p=ghc-hetmet.git

[project @ 2004-01-05 15:15:26 by igloo]
Use pprint rather than show . ppr to get String representations of TH
datastructures. Also moved pprint out of the class as we never want to
override it.
---

diff --git a/ghc/compiler/hsSyn/Convert.lhs b/ghc/compiler/hsSyn/Convert.lhs
index a12e594..4b8f04c 100644
--- a/ghc/compiler/hsSyn/Convert.lhs
+++ b/ghc/compiler/hsSyn/Convert.lhs
@@ -230,7 +230,7 @@ cvtd (TH.ValD p body ds)
   = noLoc $ PatBind (cvtlp p) (GRHSs (cvtguard body) (cvtdecs ds) void)
 
 cvtd d = cvtPanic "Illegal kind of declaration in where clause" 
-		  (text (show (TH.ppr d)))
+		  (text (TH.pprint d))
 
 
 cvtclause :: TH.Clause -> Hs.LMatch RdrName
@@ -311,7 +311,7 @@ cvt_pred :: TH.Type -> LHsPred RdrName
 cvt_pred ty = case split_ty_app ty of
 	   	(ConT tc, tys) -> noLoc (HsClassP (tconName tc) (map cvtType tys))
 	   	(VarT tv, tys) -> noLoc (HsClassP (tName tv) (map cvtType tys))
-		other -> cvtPanic "Malformed predicate" (text (show (TH.ppr ty)))
+		other -> cvtPanic "Malformed predicate" (text (TH.pprint ty))
 
 convertToHsType = cvtType
 
diff --git a/ghc/compiler/typecheck/TcSplice.lhs b/ghc/compiler/typecheck/TcSplice.lhs
index f60b844..fc95be0 100644
--- a/ghc/compiler/typecheck/TcSplice.lhs
+++ b/ghc/compiler/typecheck/TcSplice.lhs
@@ -481,7 +481,7 @@ mk_uniq :: Int# -> Unique
 mk_uniq u = mkUniqueGrimily (I# u)
 
 notInScope :: TH.Name -> SDoc
-notInScope th_name = quotes (text (show (TH.ppr th_name))) <+> 
+notInScope th_name = quotes (text (TH.pprint th_name)) <+> 
 		     ptext SLIT("is not in scope at a reify")
 	-- Ugh! Rather an indirect way to display the name