X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsGRHSs.lhs;h=4daab975ecbe28d85fdd5aae5a748a3c1a7de604;hb=235edf36cc202bb21c00d0e5e05ebf076fb0542e;hp=b64285971d8f43660915504a87a25d049359d6ce;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf;p=ghc-hetmet.git

diff --git a/compiler/deSugar/DsGRHSs.lhs b/compiler/deSugar/DsGRHSs.lhs
index b642859..4daab97 100644
--- a/compiler/deSugar/DsGRHSs.lhs
+++ b/compiler/deSugar/DsGRHSs.lhs
@@ -6,11 +6,11 @@
 Matching guarded right-hand-sides (GRHSs)
 
 \begin{code}
-{-# OPTIONS_GHC -w #-}
+{-# OPTIONS -w #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module DsGRHSs ( dsGuarded, dsGRHSs ) where
@@ -105,12 +105,10 @@ matchGuards [] ctx rhs rhs_ty
 	-- NB:	The success of this clause depends on the typechecker not
 	-- 	wrapping the 'otherwise' in empty HsTyApp or HsWrap constructors
 	--	If it does, you'll get bogus overlap warnings
-matchGuards (ExprStmt (L _ (HsVar v)) _ _ : stmts) ctx rhs rhs_ty
-  |  v `hasKey` otherwiseIdKey
-  || v `hasKey` getUnique trueDataConId	
-	-- trueDataConId doesn't have the same unique as trueDataCon
-  = matchGuards stmts ctx rhs rhs_ty
-
+matchGuards (ExprStmt e _ _ : stmts) ctx rhs rhs_ty
+  | Just addTicks <- isTrueLHsExpr e
+  = matchGuards stmts ctx rhs rhs_ty	`thenDs` \ match_result ->
+    returnDs (adjustMatchResultDs addTicks match_result)
 matchGuards (ExprStmt expr _ _ : stmts) ctx rhs rhs_ty
   = matchGuards stmts ctx rhs rhs_ty	`thenDs` \ match_result ->
     dsLExpr expr			`thenDs` \ pred_expr ->
@@ -128,6 +126,31 @@ matchGuards (BindStmt pat bind_rhs _ _ : stmts) ctx rhs rhs_ty
   = matchGuards stmts ctx rhs rhs_ty	`thenDs` \ match_result ->
     dsLExpr bind_rhs			`thenDs` \ core_rhs ->
     matchSinglePat core_rhs ctx pat rhs_ty match_result
+
+isTrueLHsExpr :: LHsExpr Id -> Maybe (CoreExpr -> DsM CoreExpr)
+
+-- Returns Just {..} if we're sure that the expression is True
+-- I.e.   * 'True' datacon
+--	  * 'otherwise' Id
+--	  * Trivial wappings of these
+-- The arguments to Just are any HsTicks that we have found,
+-- because we still want to tick then, even it they are aways evaluted.
+isTrueLHsExpr (L _ (HsVar v)) |  v `hasKey` otherwiseIdKey
+			      || v `hasKey` getUnique trueDataConId	
+                                      = Just returnDs
+	-- trueDataConId doesn't have the same unique as trueDataCon
+isTrueLHsExpr (L loc (HsTick    ix frees e)) 
+    | Just ticks <- isTrueLHsExpr e   = Just (\ e1 -> 
+			     ticks e1 `thenDs` \ e2 -> 
+			     mkTickBox ix frees e2)
+   -- This encodes that the result is constant True for Hpc tick purposes;
+   -- which is specifically what isTrueLHsExpr is trying to find out.
+isTrueLHsExpr (L loc (HsBinTick ixT _ e))
+    | Just ticks <- isTrueLHsExpr e   = Just (\ e1 -> 
+			     ticks e1 `thenDs` \ e2 -> 
+			     mkTickBox ixT [] e2)
+isTrueLHsExpr (L _ (HsPar e))         = isTrueLHsExpr e
+isTrueLHsExpr other = Nothing
 \end{code}
 
 Should {\em fail} if @e@ returns @D@