X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=acf003f6fed2631f24e7ef8302b07b3031fe3bf6;hb=1bf363052778fc39335ea3701a3229572358c51e;hp=86061be58d87d412498994426cb1dc313075069a;hpb=a835e9faf19400aa6b7999b6f64e60cb1c7737dd;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 86061be..acf003f 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -563,6 +563,7 @@ missingBootThing thing
   = ppr thing <+> ptext SLIT("is defined in the hs-boot file, but not in the module")
 bootMisMatch thing boot_decl real_decl
   = ppr thing <+> ptext SLIT("has conflicting definitions in the module and its hs-boot file")
+    $+$ (ppr boot_decl) $+$ (ppr real_decl)
 instMisMatch inst
   = hang (ppr inst)
        2 (ptext SLIT("is defined in the hs-boot file, but not in the module"))
@@ -964,15 +965,20 @@ mkPlan stmt@(L loc (BindStmt {}))
   | [L _ v] <- collectLStmtBinders stmt		-- One binder, for a bind stmt 
   = do	{ let print_v  = L loc $ ExprStmt (nlHsApp (nlHsVar printName) (nlHsVar v))
 			          	   (HsVar thenIOName) placeHolderType
+
+	; print_bind_result <- doptM Opt_PrintBindResult
+	; let print_plan = do
+		  { stuff@([v_id], _) <- tcGhciStmts [stmt, print_v]
+		  ; v_ty <- zonkTcType (idType v_id)
+		  ; ifM (isUnitTy v_ty || not (isTauTy v_ty)) failM
+		  ; return stuff }
+
 	-- The plans are:
 	--	[stmt; print v]		but not if v::()
 	--	[stmt]
-	; runPlans [do { stuff@([v_id], _) <- tcGhciStmts [stmt, print_v]
-		       ; v_ty <- zonkTcType (idType v_id)
-		       ; ifM (isUnitTy v_ty || not (isTauTy v_ty)) failM
-		       ; return stuff },
-		    tcGhciStmts [stmt]
-	  ]}
+	; runPlans ((if print_bind_result then [print_plan] else []) ++
+		    [tcGhciStmts [stmt]])
+	}
 
 mkPlan stmt
   = tcGhciStmts [stmt]