From a99906e5272be7c6212327a32c83eac0a9b08b4b Mon Sep 17 00:00:00 2001
From: "simonpj@microsoft.com" <unknown>
Date: Thu, 28 May 2009 16:50:39 +0000
Subject: [PATCH] Print more nicely in -ddump-splices

When you say -ddump-splices, the "before" expression is now

        *renamed* but not *typechecked"

Reason (a) less typechecking crap
       (b) data constructors after type checking have been
	   changed to their *wrappers*, and that makes them
	   print always fully qualified
---
 compiler/typecheck/TcSplice.lhs |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/compiler/typecheck/TcSplice.lhs b/compiler/typecheck/TcSplice.lhs
index 7b92b81..63c13e3 100644
--- a/compiler/typecheck/TcSplice.lhs
+++ b/compiler/typecheck/TcSplice.lhs
@@ -348,8 +348,7 @@ tcTopSplice expr res_ty = do
 
     traceTc (text "Got result" <+> ppr expr2)
 
-    showSplice "expression" 
-               zonked_q_expr (ppr expr2)
+    showSplice "expression" expr (ppr expr2)
 
         -- Rename it, but bale out if there are errors
         -- otherwise the type checker just gives more spurious errors
@@ -489,7 +488,7 @@ runQuasiQuote (HsQuasiQuote _name quoter q_span quote) quote_selector desc meta_
       	; traceTc (text "About to run" <+> ppr zonked_q_expr)
       	; result <- runMetaQ convert zonked_q_expr
       	; traceTc (text "Got result" <+> ppr result)
-      	; showSplice desc zonked_q_expr (ppr result)
+      	; showSplice desc quoteExpr (ppr result)
       	; return result
       	}
 
@@ -559,7 +558,7 @@ kcTopSpliceType expr
   
 	; traceTc (text "Got result" <+> ppr hs_ty2)
 
-	; showSplice "type" zonked_q_expr (ppr hs_ty2)
+	; showSplice "type" expr (ppr hs_ty2)
 
 	-- Rename it, but bale out if there are errors
 	-- otherwise the type checker just gives more spurious errors
@@ -591,7 +590,7 @@ tcSpliceDecls expr
 
 	; traceTc (text "Got result" <+> vcat (map ppr decls))
 	; showSplice "declarations"
-	  	     zonked_q_expr 
+	  	     expr 
 		     (ppr (getLoc expr) $$ (vcat (map ppr decls)))
 	; return decls }
 \end{code}
@@ -764,13 +763,18 @@ instance TH.Quasi (IOEnv (Env TcGblEnv TcLclEnv)) where
 %************************************************************************
 
 \begin{code}
-showSplice :: String -> LHsExpr Id -> SDoc -> TcM ()
-showSplice what before after = do
-    loc <- getSrcSpanM
-    traceSplice (vcat [ppr loc <> colon <+> text "Splicing" <+> text what, 
-		       nest 2 (sep [nest 2 (ppr before),
-				    text "======>",
-				    nest 2 after])])
+showSplice :: String -> LHsExpr Name -> SDoc -> TcM ()
+-- Note that 'before' is *renamed* but not *typechecked*
+-- Reason (a) less typechecking crap
+--        (b) data constructors after type checking have been
+--	      changed to their *wrappers*, and that makes them
+--	      print always fully qualified
+showSplice what before after
+  = do { loc <- getSrcSpanM
+       ; traceSplice (vcat [ppr loc <> colon <+> text "Splicing" <+> text what, 
+		            nest 2 (sep [nest 2 (ppr before),
+				         text "======>",
+				         nest 2 after])]) }
 
 illegalBracket :: ThStage -> SDoc
 illegalBracket level
-- 
1.7.10.4