X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fstranal%2FWwLib.lhs;h=31d09901ec9fdaa2a1f9ffe3778964c65a719d75;hp=589678530b4e7d3fbcede005fcddaed605e04393;hb=7fc749a43b4b6b85d234fa95d4928648259584f4;hpb=4a7acfe8e74b4367c8043db7b824f203bf13ce00

diff --git a/compiler/stranal/WwLib.lhs b/compiler/stranal/WwLib.lhs
index 5896785..31d0990 100644
--- a/compiler/stranal/WwLib.lhs
+++ b/compiler/stranal/WwLib.lhs
@@ -4,6 +4,13 @@
 \section[WwLib]{A library for the ``worker/wrapper'' back-end to the strictness analyser}
 
 \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 WwLib ( mkWwBodies, mkWWstr, mkWorkerArgs ) where
 
 #include "HsVersions.h"
@@ -21,9 +28,9 @@ import MkId		( realWorldPrimId, voidArgId, mkRuntimeErrorApp, rUNTIME_ERROR_ID,
                           mkUnpackCase, mkProductBox )
 import TysWiredIn	( tupleCon )
 import Type		( Type, isUnLiftedType, mkFunTys,
-			  splitForAllTys, splitFunTys, splitRecNewType_maybe, isAlgType
+			  splitForAllTys, splitFunTys, isAlgType
 			)
-import Coercion         ( Coercion, mkSymCoercion, splitRecNewTypeCo_maybe )
+import Coercion         ( mkSymCoercion, splitNewTypeRepCo_maybe )
 import BasicTypes	( Boxity(..) )
 import Var              ( Var, isId )
 import UniqSupply	( returnUs, thenUs, getUniquesUs, UniqSM )
@@ -132,9 +139,9 @@ mkWwBodies fun_ty demands res_info one_shots
 	mkWWcpr res_ty res_info
      else
 	returnUs (id, id, res_ty)
-    )					`thenUs` \ (wrap_fn_cpr, work_fn_cpr,  cpr_res_ty) ->
+    )					`thenUs` \ (wrap_fn_cpr, work_fn_cpr,  _cpr_res_ty) ->
 
-    returnUs ([idNewDemandInfo v | v <- work_args, isId v],
+    returnUs ([idNewDemandInfo v | v <- work_call_args, isId v],
 	      Note InlineMe . wrap_fn_args . wrap_fn_cpr . wrap_fn_str . applyToVars work_call_args . Var,
 	      mkLams work_lam_args. work_fn_str . work_fn_cpr . work_fn_args)
 	-- We use an INLINE unconditionally, even if the wrapper turns out to be
@@ -225,7 +232,7 @@ mkWWargs :: Type
 		     Type)			-- Type of wrapper body
 
 mkWWargs fun_ty demands one_shots
-  | Just (rep_ty, co) <- splitRecNewTypeCo_maybe fun_ty
+  | Just (rep_ty, co) <- splitNewTypeRepCo_maybe fun_ty
    	-- The newtype case is for when the function has
 	-- a recursive newtype after the arrow (rare)
 	-- We check for arity >= 0 to avoid looping in the case
@@ -238,8 +245,8 @@ mkWWargs fun_ty demands one_shots
 	-- simply coerces.
   = mkWWargs rep_ty demands one_shots	`thenUs` \ (wrap_args, wrap_fn_args, work_fn_args, res_ty) ->
     returnUs (wrap_args,
-	      \ e -> Cast (wrap_fn_args e) co,
-	      \ e -> work_fn_args (Cast e (mkSymCoercion co)),
+	      \ e -> Cast (wrap_fn_args e) (mkSymCoercion co),
+	      \ e -> work_fn_args (Cast e co),
 	      res_ty)
   | notNull demands
   = getUniquesUs 		`thenUs` \ wrap_uniqs ->
@@ -341,13 +348,13 @@ mkWWstr_one arg
 
 	-- Unpack case
       Eval (Prod cs)
-	| Just (arg_tycon, tycon_arg_tys, data_con, inst_con_arg_tys) 
+	| Just (_arg_tycon, _tycon_arg_tys, data_con, inst_con_arg_tys) 
 		<- deepSplitProductType_maybe (idType arg)
 	-> getUniquesUs 		`thenUs` \ uniqs ->
 	   let
 	     unpk_args	    = zipWith mk_ww_local uniqs inst_con_arg_tys
 	     unpk_args_w_ds = zipWithEqual "mkWWstr" set_worker_arg_info unpk_args cs
-	     unbox_fn       = mkUnpackCase (sanitiseCaseBndr arg) (Var arg) (idType arg) unpk_args data_con
+	     unbox_fn       = mkUnpackCase (sanitiseCaseBndr arg) (Var arg) unpk_args data_con
 	     rebox_fn	    = Let (NonRec arg con_app) 
 	     con_app	    = mkProductBox unpk_args (idType arg)
 	   in
@@ -431,7 +438,7 @@ mkWWcpr body_ty RetCPR
 	con_app   = mkProductBox [arg] body_ty
       in
       returnUs (\ wkr_call -> Case wkr_call (arg) (exprType con_app) [(DEFAULT, [], con_app)],
-		\ body     -> workerCase (work_wild) body body_ty [arg] data_con (Var arg),
+		\ body     -> workerCase (work_wild) body [arg] data_con (Var arg),
 		con_arg_ty1)
 
     | otherwise		-- The general case
@@ -447,10 +454,10 @@ mkWWcpr body_ty RetCPR
         con_app			       = mkProductBox args body_ty
       in
       returnUs (\ wkr_call -> Case wkr_call (wrap_wild) (exprType con_app)  [(DataAlt ubx_tup_con, args, con_app)],
-		\ body     -> workerCase (work_wild) body body_ty args data_con ubx_tup_app,
+		\ body     -> workerCase (work_wild) body args data_con ubx_tup_app,
 		ubx_tup_ty)
     where
-      (_, tycon_arg_tys, data_con, con_arg_tys) = deepSplitProductType "mkWWcpr" body_ty
+      (_arg_tycon, _tycon_arg_tys, data_con, con_arg_tys) = deepSplitProductType "mkWWcpr" body_ty
       n_con_args  = length con_arg_tys
       con_arg_ty1 = head con_arg_tys
 
@@ -468,8 +475,8 @@ mkWWcpr body_ty other		-- No CPR info
 -- This transform doesn't move work or allocation
 -- from one cost centre to another
 
-workerCase bndr (Note (SCC cc) e) ty args con body = Note (SCC cc) (mkUnpackCase bndr e ty args con body)
-workerCase bndr e ty args con body = mkUnpackCase bndr e ty args con body
+workerCase bndr (Note (SCC cc) e) args con body = Note (SCC cc) (mkUnpackCase bndr e args con body)
+workerCase bndr e args con body = mkUnpackCase bndr e args con body
 \end{code}