Fix name-capture bug in rule matching

[ghc-hetmet.git] / compiler / coreSyn / CorePrep.lhs

diff --git a/compiler/coreSyn/CorePrep.lhs b/compiler/coreSyn/CorePrep.lhs
index c8f35ea..fb31e45 100644 (file)
--- a/compiler/coreSyn/CorePrep.lhs
+++ b/compiler/coreSyn/CorePrep.lhs
@@ -1,7 +1,8 @@
 %
-% (c) The University of Glasgow, 1994-2000
+% (c) The University of Glasgow, 1994-2006
 %
-\section{Core pass to saturate constructors and PrimOps}
+
+Core pass to saturate constructors and PrimOps
 
 \begin{code}
 module CorePrep (
@@ -10,34 +11,29 @@ module CorePrep (
 
 #include "HsVersions.h"
 
-import CoreUtils( exprType, exprIsHNF, etaExpand, exprArity, exprOkForSpeculation )
-import CoreFVs ( exprFreeVars )
-import CoreLint        ( endPass )
+import CoreUtils hiding (exprIsTrivial)
+import CoreFVs
+import CoreLint
 import CoreSyn
-import Type    ( Type, applyTy, 
-                  splitFunTy_maybe, isUnLiftedType, isUnboxedTupleType, seqType )
-import Coercion ( coercionKind )
-import TyCon   ( TyCon, tyConDataCons )
-import NewDemand  ( Demand, isStrictDmd, lazyDmd, StrictSig(..), DmdType(..) )
-import Var     ( Var, Id, setVarUnique )
+import Type
+import Coercion
+import TyCon
+import NewDemand
+import Var
 import VarSet
 import VarEnv
-import Id      ( mkSysLocal, idType, idNewDemandInfo, idArity, setIdUnfolding, 
-                 isFCallId, isGlobalId, isLocalId, hasNoBinding, idNewStrictness, 
-                 isPrimOpId_maybe
-               )
-import DataCon   ( dataConWorkId )
-import PrimOp    ( PrimOp( DataToTagOp ) )
-import BasicTypes ( TopLevelFlag(..), isTopLevel, isNotTopLevel,
-                   RecFlag(..), isNonRec
-                 )
+import Id
+import DataCon
+import PrimOp
+import BasicTypes
 import UniqSupply
 import Maybes
 import OrdList
 import ErrUtils
 import DynFlags
-import Util       ( listLengthCmp )
+import Util
 import Outputable
+import TysWiredIn
 \end{code}
 
 -- ---------------------------------------------------------------------------
@@ -338,6 +334,8 @@ exprIsTrivial (Type _)                     = True
 exprIsTrivial (Lit lit)               = True
 exprIsTrivial (App e arg)             = isTypeArg arg && exprIsTrivial e
 exprIsTrivial (Note (SCC _) e)                = False
+exprIsTrivial (Note (TickBox {}) e)    = False
+exprIsTrivial (Note (BinaryTickBox {}) e) = False
 exprIsTrivial (Note _ e)              = exprIsTrivial e
 exprIsTrivial (Cast e co)              = exprIsTrivial e
 exprIsTrivial (Lam b body) | isTyVar b = exprIsTrivial body
@@ -385,6 +383,23 @@ corePrepExprFloat env (Note n@(SCC _) expr)
     deLamFloat expr1                   `thenUs` \ (floats, expr2) ->
     returnUs (floats, Note n expr2)
 
+corePrepExprFloat env (Note note@(TickBox {}) expr)
+  = corePrepAnExpr env expr            `thenUs` \ expr1 ->
+    deLamFloat expr1                   `thenUs` \ (floats, expr2) ->
+    return (floats, Note note expr2)
+
+corePrepExprFloat env (Note note@(BinaryTickBox m t e) expr)
+  = corePrepAnExpr env expr            `thenUs` \ expr1 ->
+    deLamFloat expr1                   `thenUs` \ (floats, expr2) ->
+    getUniqueUs                        `thenUs` \ u ->
+    let bndr = mkSysLocal FSLIT("t") u boolTy in
+    return (floats, Case expr2
+                       bndr
+                       boolTy
+                       [ (DataAlt falseDataCon, [], Note (TickBox m e) (Var falseDataConId))
+                       , (DataAlt trueDataCon,  [], Note (TickBox m t) (Var trueDataConId))
+                       ])
+
 corePrepExprFloat env (Note other_note expr)
   = corePrepExprFloat env expr         `thenUs` \ (floats, expr') ->
     returnUs (floats, Note other_note expr')
@@ -400,6 +415,21 @@ corePrepExprFloat env expr@(Lam _ _)
   where
     (bndrs,body) = collectBinders expr
 
+corePrepExprFloat env (Case (Note note@(TickBox m n) expr) bndr ty alts)
+  = corePrepExprFloat env (Note note (Case expr bndr ty alts))
+
+corePrepExprFloat env (Case (Note note@(BinaryTickBox m t e) expr) bndr ty alts)
+  = do { ASSERT(exprType expr `coreEqType` boolTy)
+         corePrepExprFloat env $
+               Case expr bndr ty
+                       [ (DataAlt falseDataCon, [], Note (TickBox m e) falseBranch)
+                       , (DataAlt trueDataCon,  [], Note (TickBox m t) trueBranch)
+                       ]
+       }
+   where
+       (_,_,trueBranch)  = findAlt (DataAlt trueDataCon) alts
+       (_,_,falseBranch) = findAlt (DataAlt falseDataCon) alts
+
 corePrepExprFloat env (Case scrut bndr ty alts)
   = corePrepExprFloat env scrut                `thenUs` \ (floats1, scrut1) ->
     deLamFloat scrut1                  `thenUs` \ (floats2, scrut2) ->