X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fstranal%2FWorkWrap.lhs;h=fbac09bc6c81b55d945074a068233ce5895970a4;hb=edfe93593306cebc7981f5df2d634f9547849587;hp=4a749243e24c6dd67d8c155f95171013a111d9e3;hpb=5142f916a7d40af80a250311c43e502a56a63b11;p=ghc-hetmet.git

diff --git a/ghc/compiler/stranal/WorkWrap.lhs b/ghc/compiler/stranal/WorkWrap.lhs
index 4a74924..fbac09b 100644
--- a/ghc/compiler/stranal/WorkWrap.lhs
+++ b/ghc/compiler/stranal/WorkWrap.lhs
@@ -4,11 +4,9 @@
 \section[WorkWrap]{Worker/wrapper-generating back-end of strictness analyser}
 
 \begin{code}
-#include "HsVersions.h"
-
 module WorkWrap ( workersAndWrappers, getWorkerIdAndCons ) where
 
-IMP_Ubiq(){-uitous-}
+#include "HsVersions.h"
 
 import CoreSyn
 import CoreUnfold	( Unfolding, certainlySmallEnoughToInline, calcUnfoldingGuidance )
@@ -17,18 +15,16 @@ import CmdLineOpts	( opt_UnfoldingCreationThreshold )
 import CoreUtils	( coreExprType )
 import Id		( getInlinePragma, getIdStrictness, mkWorkerId,
 			  addIdStrictness, addInlinePragma,
-			  SYN_IE(IdSet), emptyIdSet, addOneToIdSet,
-			  GenId, SYN_IE(Id)
+			  IdSet, emptyIdSet, addOneToIdSet,
+			  GenId, Id
 			)
 import IdInfo		( noIdInfo, addUnfoldInfo,  
 			  mkStrictnessInfo, addStrictnessInfo, StrictnessInfo(..)
 			)
 import SaLib
-import UniqSupply	( returnUs, thenUs, mapUs, getUnique, SYN_IE(UniqSM) )
+import UniqSupply	( returnUs, thenUs, mapUs, getUnique, UniqSM )
 import WwLib
-import Pretty		( Doc )
-import Outputable	( ppr, PprStyle(..) )
-import Util		( pprPanic )
+import Outputable
 \end{code}
 
 We take Core bindings whose binders have their strictness attached (by
@@ -204,7 +200,7 @@ tryWW fn_id rhs
 
   | otherwise		-- Do w/w split
   = let
-	(uvars, tyvars, wrap_args, body) = collectBinders rhs
+	(tyvars, wrap_args, body) = collectBinders rhs
     in
     mkWwBodies tyvars wrap_args 
 	       (coreExprType body)
@@ -235,7 +231,7 @@ tryWW fn_id rhs
 			StrictnessInfo args_info _ -> args_info
     revised_wrap_args_info = setUnpackStrategy wrap_args_info
 
--- This rather crude function looks at a wrapper function, and
+-- This rather (nay! extremely!) crude function looks at a wrapper function, and
 -- snaffles out (a) the worker Id and (b) constructors needed to 
 -- make the wrapper.
 -- These are needed when we write an interface file.
@@ -252,5 +248,5 @@ getWorkerIdAndCons wrap_id wrapper_fn
 
     get_work_id (App fn _)    = get_work_id fn
     get_work_id (Var work_id) = work_id
-    get_work_id other	      = pprPanic "getWorkerIdAndCons" (ppr PprDebug wrap_id)
+    get_work_id other	      = pprPanic "getWorkerIdAndCons" (ppr wrap_id)
 \end{code}