X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Fstranal%2FWwLib.lhs;h=4fa859a4e4c9cabe76f9930e8264e63087410d14;hb=0596517a9b4b2b32e5d375a986351102ac4540fc;hp=b87bd4c61c3b5e3805fe9bc22606524e6b9729dd;hpb=6c381e873e222417d9a67aeec77b9555eca7b7a8;p=ghc-hetmet.git

diff --git a/ghc/compiler/stranal/WwLib.lhs b/ghc/compiler/stranal/WwLib.lhs
index b87bd4c..4fa859a 100644
--- a/ghc/compiler/stranal/WwLib.lhs
+++ b/ghc/compiler/stranal/WwLib.lhs
@@ -31,8 +31,8 @@ import IdInfo		-- lots of things
 import Maybes		( maybeToBool, Maybe(..), MaybeErr )
 import SaLib
 import SrcLoc		( mkUnknownSrcLoc )
-import Type		( mkTyVarTy, mkFunTys, isPrimType,
-			  maybeDataTyCon, quantifyTy
+import Type		( mkTyVarTys, mkFunTys, isPrimType,
+			  maybeAppDataTyCon, quantifyTy
 			)
 import UniqSupply
 -}
@@ -230,7 +230,7 @@ mkWwBodies body_ty tyvars args arg_infos
 	wrapper_w_hole = \ worker_id ->
 				mkLam tyvars args (
 				wrap_frag (
-				mkCoTyApps (Var worker_id) (map mkTyVarTy tyvars)
+				mkCoTyApps (Var worker_id) (mkTyVarTys tyvars)
 			 ))
 
 	worker_w_hole = \ orig_body ->
@@ -326,7 +326,7 @@ mk_ww_arg_processing (arg : args) (WwUnpack cmpnt_infos : infos) max_extra_args
   | new_max_extra_args > 0	-- Check that we are prepared to add arguments
   = 	-- this is the complicated one.
     --pprTrace "Unpack; num_wrkr_args=" (ppCat [ppInt num_wrkr_args, ppStr "; new_max=", ppInt new_num_wrkr_args, ppStr "; arg=", ppr PprDebug arg, ppr PprDebug (WwUnpack cmpnt_infos)]) (
-    case maybeDataTyCon arg_ty of
+    case maybeAppDataTyCon arg_ty of
 
 	  Nothing 	  -> 	   -- Not a data type
 				   panic "mk_ww_arg_processing: not datatype"