From a6ba9700a96d623ddac728ed7e4df4ebe32ac99a Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Thu, 15 Oct 2009 07:01:47 +0000 Subject: [PATCH] Fix warnings --- compiler/deSugar/DsMonad.lhs | 3 +-- compiler/vectorise/VectBuiltIn.hs | 14 +++++--------- compiler/vectorise/VectType.hs | 19 +++++++++---------- compiler/vectorise/VectUtils.hs | 2 +- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs index 11be59c..fa96811 100644 --- a/compiler/deSugar/DsMonad.lhs +++ b/compiler/deSugar/DsMonad.lhs @@ -327,8 +327,7 @@ dsLoadModule :: SDoc -> Module -> DsM () dsLoadModule doc mod = do { env <- getGblEnv ; setEnvs (ds_if_env env) - (loadSysInterface doc mod) - ; return () + (loadSysInterface doc mod >> return ()) } \end{code} diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs index 2f0b0d9..77b4243 100644 --- a/compiler/vectorise/VectBuiltIn.hs +++ b/compiler/vectorise/VectBuiltIn.hs @@ -27,11 +27,11 @@ import OccName import TypeRep ( funTyCon ) import Type ( Type, mkTyConApp ) import TysPrim -import TysWiredIn ( unitTyCon, unitDataCon, +import TysWiredIn ( unitDataCon, tupleTyCon, tupleCon, - intTyCon, intTyConName, - doubleTyCon, doubleTyConName, - boolTyCon, boolTyConName, trueDataCon, falseDataCon, + intTyCon, + doubleTyCon, + boolTyCon, trueDataCon, falseDataCon, parrTyConName ) import PrelNames ( word8TyConName, gHC_PARR ) import BasicTypes ( Boxity(..) ) @@ -156,7 +156,7 @@ sumTyCon :: Int -> Builtins -> TyCon sumTyCon = indexBuiltin "sumTyCon" sumTyCons prodTyCon :: Int -> Builtins -> TyCon -prodTyCon n bi +prodTyCon n _ | n >= 2 && n <= mAX_DPH_PROD = tupleTyCon Boxed n | otherwise = pprPanic "prodTyCon" (ppr n) @@ -595,10 +595,6 @@ externalClass :: Module -> FastString -> DsM Class externalClass mod fs = dsLookupClass =<< lookupOrig mod (mkClsOccFS fs) -unitTyConName :: Name -unitTyConName = tyConName unitTyCon - - primMethod :: TyCon -> String -> Builtins -> DsM (Maybe Var) primMethod tycon method (Builtins { dphModules = mods }) | Just suffix <- lookupNameEnv prim_ty_cons (tyConName tycon) diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs index e75c977..7540e1a 100644 --- a/compiler/vectorise/VectType.hs +++ b/compiler/vectorise/VectType.hs @@ -37,7 +37,7 @@ import FastString import MonadUtils ( zipWith3M, foldrM, concatMapM ) import Control.Monad ( liftM, liftM2, zipWithM, zipWithM_, mapAndUnzipM ) -import Data.List ( inits, tails, zipWith4, zipWith5, zipWith6 ) +import Data.List ( inits, tails, zipWith4, zipWith6 ) -- ---------------------------------------------------------------------------- -- Types @@ -332,7 +332,7 @@ buildToPRepr vect_tc repr_tc _ repr wrap_repr_inst = wrapFamInstBody repr_tc ty_args - to_sum arg arg_ty res_ty EmptySum + to_sum _ _ _ EmptySum = do void <- builtin voidVar return $ wrap_repr_inst $ Var void @@ -348,8 +348,7 @@ buildToPRepr vect_tc repr_tc _ repr , repr_cons = cons }) = do alts <- mapM con_alt cons - let ty_args = map Type tys - alts' = [(pat, vars, wrap_repr_inst + let alts' = [(pat, vars, wrap_repr_inst $ mkConApp sum_con (map Type tys ++ [body])) | ((pat, vars, body), sum_con) <- zip alts (tyConDataCons sum_tc)] @@ -400,7 +399,7 @@ buildFromPRepr vect_tc repr_tc _ repr ty_args = mkTyVarTys (tyConTyVars vect_tc) res_ty = mkTyConApp vect_tc ty_args - from_sum expr EmptySum + from_sum _ EmptySum = do dummy <- builtin fromVoidVar return $ Var dummy `App` Type res_ty @@ -419,7 +418,7 @@ buildFromPRepr vect_tc repr_tc _ repr from_con expr (ConRepr con r) = from_prod expr (mkConApp con $ map Type ty_args) r - from_prod expr con EmptyProd = return con + from_prod _ con EmptyProd = return con from_prod expr con (UnaryProd r) = do e <- from_comp expr r @@ -562,7 +561,7 @@ buildFromArrPRepr vect_tc prepr_tc pdata_tc r [pdata_con] = tyConDataCons pdata_tc - from_sum res_ty res expr EmptySum = return (res, []) + from_sum _ res _ EmptySum = return (res, []) from_sum res_ty res expr (UnarySum r) = from_con res_ty res expr r from_sum res_ty res expr (Sum { repr_psum_tc = psum_tc , repr_sel_ty = sel_ty @@ -583,7 +582,7 @@ buildFromArrPRepr vect_tc prepr_tc pdata_tc r from_con res_ty res expr (ConRepr _ r) = from_prod res_ty res expr r - from_prod res_ty res expr EmptyProd = return (res, []) + from_prod _ res _ EmptyProd = return (res, []) from_prod res_ty res expr (UnaryProd r) = from_comp res_ty res expr r from_prod res_ty res expr (Prod { repr_ptup_tc = ptup_tc @@ -600,8 +599,8 @@ buildFromArrPRepr vect_tc prepr_tc pdata_tc r where [ptup_con] = tyConDataCons ptup_tc - from_comp res_ty res expr (Keep _ _) = return (res, [expr]) - from_comp res_ty res expr (Wrap ty) + from_comp _ res expr (Keep _ _) = return (res, [expr]) + from_comp _ res expr (Wrap ty) = do wrap_tc <- builtin wrapTyCon (pwrap_tc, _) <- pdataReprTyCon (mkTyConApp wrap_tc [ty]) diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index caa4f40..dcef9d8 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -243,7 +243,7 @@ prDictOfTyApp (TyConApp tc _) ty_args = do dfun <- prDFunOfTyCon tc prDFunApply dfun ty_args -prDictOfTyApp ty _ = noV +prDictOfTyApp _ _ = noV prDFunApply :: CoreExpr -> [Type] -> VM CoreExpr prDFunApply dfun tys -- 1.7.10.4