X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FcoreSyn%2FCorePrep.lhs;h=757d7da3a565ec0411ae85e05808706364972998;hb=7fc749a43b4b6b85d234fa95d4928648259584f4;hp=88fa8b7612901a6f98229e9732955afc91e0c51b;hpb=8100cd4395e46ae747be4298c181a4730d6206bc;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CorePrep.lhs b/compiler/coreSyn/CorePrep.lhs
index 88fa8b7..757d7da 100644
--- a/compiler/coreSyn/CorePrep.lhs
+++ b/compiler/coreSyn/CorePrep.lhs
@@ -5,6 +5,13 @@
 Core pass to saturate constructors and PrimOps
 
 \begin{code}
+{-# 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/Commentary/CodingStyle#Warnings
+-- for details
+
 module CorePrep (
       corePrepPgm, corePrepExpr
   ) where
@@ -34,9 +41,6 @@ import ErrUtils
 import DynFlags
 import Util
 import Outputable
-import TysWiredIn
-import MkId
-import TysPrim
 \end{code}
 
 -- ---------------------------------------------------------------------------
@@ -390,30 +394,6 @@ corePrepExprFloat env (Case (Var id) bndr ty [(DEFAULT,[],expr)])
     deLamFloat expr1                   `thenUs` \ (floats, expr2) ->
     return (floats, Case (Var id) bndr ty [(DEFAULT,[],expr2)])
 
--- Translate Binary tickBox into standard tickBox
-corePrepExprFloat env (App (Var id) expr)
-  | Just (BinaryTickBox m t e) <- isTickBoxOp_maybe id
-  = corePrepAnExpr env expr            `thenUs` \ expr1 ->
-    deLamFloat expr1                   `thenUs` \ (floats, expr2) ->
-    getUniqueUs                        `thenUs` \ u1 ->
-    getUniqueUs                        `thenUs` \ u2 ->
-    getUniqueUs                        `thenUs` \ u3 ->
-    getUniqueUs                        `thenUs` \ u4 ->
-    getUniqueUs                        `thenUs` \ u5 ->
-    let bndr1 = mkSysLocal FSLIT("t1") u1 boolTy in
-    let bndr2 = mkSysLocal FSLIT("t2") u2 realWorldStatePrimTy in
-    let bndr3 = mkSysLocal FSLIT("t3") u3 realWorldStatePrimTy in
-    let tick_e  = mkTickBoxOpId u4 m e in
-    let tick_t  = mkTickBoxOpId u5 m t in
-    return (floats, Case expr2
-                       bndr1
-                       boolTy
-                       [ (DataAlt falseDataCon, [], 
-			  Case (Var tick_e) bndr2 boolTy [(DEFAULT,[],Var falseDataConId)])
-                       , (DataAlt trueDataCon,  [], 
-			  Case (Var tick_t) bndr3 boolTy [(DEFAULT,[],Var trueDataConId)])
-                       ])
-
 corePrepExprFloat env (Note other_note expr)
   = corePrepExprFloat env expr		`thenUs` \ (floats, expr') ->
     returnUs (floats, Note other_note expr')
@@ -429,38 +409,6 @@ corePrepExprFloat env expr@(Lam _ _)
   where
     (bndrs,body) = collectBinders expr
 
--- This is an (important) optimization.
--- case <btick,A,B>  e of { T -> e1 ; F -> e2 }
---  ==> case e of { T -> <tick,A> e1 ; F -> <tick,B> e2 }
--- This could move into the simplifier.
-
-corePrepExprFloat env (Case (App (Var id) expr) bndr ty alts)
-  | Just (BinaryTickBox m t e) <- isTickBoxOp_maybe id
-  = getUniqueUs                        `thenUs` \ u1 ->
-    getUniqueUs                        `thenUs` \ u2 ->
-    getUniqueUs                        `thenUs` \ u3 ->
-    getUniqueUs                        `thenUs` \ u4 ->
-    getUniqueUs                        `thenUs` \ u5 ->
-    let bndr1 = mkSysLocal FSLIT("t1") u1 boolTy in
-    let bndr2 = mkSysLocal FSLIT("t2") u2 realWorldStatePrimTy in
-    let bndr3 = mkSysLocal FSLIT("t3") u3 realWorldStatePrimTy in
-    let tick_e  = mkTickBoxOpId u4 m e in
-    let tick_t  = mkTickBoxOpId u5 m t in
-    ASSERT (exprType expr `coreEqType` boolTy)
-    corePrepExprFloat env $
-		Case expr
-                       bndr1
-                       ty
-                       [ (DataAlt falseDataCon, [], 
-			  Case (Var tick_e) bndr2 ty [(DEFAULT,[],falseBranch)])
-                       , (DataAlt trueDataCon,  [], 
-			  Case (Var tick_t) bndr3 ty [(DEFAULT,[],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) ->