Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/3b045c3124797215f26f1d819dc92b353f18fc40 >--------------------------------------------------------------- commit 3b045c3124797215f26f1d819dc92b353f18fc40 Author: Ben Lippmeier <[email protected]> Date: Thu Nov 17 13:30:02 2011 +1100 vectoriser: mkCast args the other way around, and fix warning >--------------------------------------------------------------- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 9 ++++----- compiler/vectorise/Vectorise/Type/Env.hs | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/compiler/vectorise/Vectorise/Generic/PAMethods.hs b/compiler/vectorise/Vectorise/Generic/PAMethods.hs index b83e01d..07ddd68 100644 --- a/compiler/vectorise/Vectorise/Generic/PAMethods.hs +++ b/compiler/vectorise/Vectorise/Generic/PAMethods.hs @@ -242,7 +242,7 @@ buildToArrPRepr vect_tc prepr_tc pdata_tc _ r return . Lam arg $ mkWildCase scrut (mkTyConApp pdata_tc ty_args) res_ty - [(DataAlt pdata_dc, vars, mkCast co result)] + [(DataAlt pdata_dc, vars, mkCast result co)] where ty_args = mkTyVarTys $ tyConTyVars vect_tc el_ty = mkTyConApp vect_tc ty_args @@ -304,7 +304,7 @@ buildFromArrPRepr vect_tc prepr_tc pdata_tc _ r let co = mkAppCo pdata_co $ mkAxInstCo repr_co var_tys - let scrut = mkCast co (Var arg) + let scrut = mkCast (Var arg) co let mk_result args = wrapFamInstBody pdata_tc var_tys @@ -398,7 +398,7 @@ buildToArrPReprs vect_tc prepr_tc _ pdatas_tc r return $ Lam varg $ mkWildCase scrut (mkTyConApp pdatas_tc ty_args) res_ty - [(DataAlt pdatas_dc, vars, mkCast co result)] + [(DataAlt pdatas_dc, vars, mkCast result co)] where -- The element type of the argument. @@ -478,7 +478,7 @@ buildFromArrPReprs vect_tc prepr_tc _ pdatas_tc r let co = mkAppCo pdatas_co $ mkAxInstCo repr_co var_tys - let scrut = mkCast co (Var varg) + let scrut = mkCast (Var varg) co let mk_result args = wrapFamInstBody pdatas_tc var_tys @@ -491,7 +491,6 @@ buildFromArrPReprs vect_tc prepr_tc _ pdatas_tc r return $ Lam varg expr where var_tys = mkTyVarTys $ tyConTyVars vect_tc - el_ty = mkTyConApp vect_tc var_tys [pdatas_con] = tyConDataCons pdatas_tc from_sum res_ty res expr ss diff --git a/compiler/vectorise/Vectorise/Type/Env.hs b/compiler/vectorise/Vectorise/Type/Env.hs index 674536a..e1efc96 100644 --- a/compiler/vectorise/Vectorise/Type/Env.hs +++ b/compiler/vectorise/Vectorise/Type/Env.hs @@ -39,7 +39,6 @@ import FastString import MonadUtils import Control.Monad import Data.List -import Data.Maybe -- Note [Pragmas to vectorise tycons] -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
