projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db0e973
)
Fixed warnings in vectorise/VectBuiltIn
author
Twan van Laarhoven
<twanvl@gmail.com>
Sun, 3 Feb 2008 22:40:43 +0000
(22:40 +0000)
committer
Twan van Laarhoven
<twanvl@gmail.com>
Sun, 3 Feb 2008 22:40:43 +0000
(22:40 +0000)
compiler/vectorise/VectBuiltIn.hs
patch
|
blob
|
history
diff --git
a/compiler/vectorise/VectBuiltIn.hs
b/compiler/vectorise/VectBuiltIn.hs
index
c2610fb
..
7dc84ee
100644
(file)
--- a/
compiler/vectorise/VectBuiltIn.hs
+++ b/
compiler/vectorise/VectBuiltIn.hs
@@
-1,10
+1,3
@@
-{-# 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 VectBuiltIn (
Builtins(..), sumTyCon, prodTyCon, uarrTy, intPrimArrayTy,
combinePAVar,
module VectBuiltIn (
Builtins(..), sumTyCon, prodTyCon, uarrTy, intPrimArrayTy,
combinePAVar,
@@
-20,7
+13,7
@@
module VectBuiltIn (
import DsMonad
import IfaceEnv ( lookupOrig )
import DsMonad
import IfaceEnv ( lookupOrig )
-import Module ( Module )
+import Module
import DataCon ( DataCon, dataConName, dataConWorkId )
import TyCon ( TyCon, tyConName, tyConDataCons )
import Var ( Var )
import DataCon ( DataCon, dataConName, dataConWorkId )
import TyCon ( TyCon, tyConName, tyConDataCons )
import Var ( Var )
@@
-37,9
+30,8
@@
import TysWiredIn ( unitTyCon, unitDataCon,
intTyCon, intTyConName, intTy,
doubleTyCon, doubleTyConName,
boolTyCon, boolTyConName, trueDataCon, falseDataCon,
intTyCon, intTyConName, intTy,
doubleTyCon, doubleTyConName,
boolTyCon, boolTyConName, trueDataCon, falseDataCon,
- parrTyCon, parrTyConName )
+ parrTyConName )
import PrelNames ( gHC_PARR )
import PrelNames ( gHC_PARR )
-import Module
import BasicTypes ( Boxity(..) )
import FastString
import BasicTypes ( Boxity(..) )
import FastString
@@
-61,6
+53,9
@@
mAX_NDP_COMBINE = 2
mkNDPModule :: FastString -> Module
mkNDPModule m = mkModule ndpPackageId (mkModuleNameFS m)
mkNDPModule :: FastString -> Module
mkNDPModule m = mkModule ndpPackageId (mkModuleNameFS m)
+nDP_UARR, nDP_PARRAY, nDP_REPR, nDP_CLOSURE, nDP_UNBOXED, nDP_INSTANCES, nDP_COMBINATORS,
+ nDP_PRELUDE_PARR, nDP_PRELUDE_INT, nDP_PRELUDE_DOUBLE :: Module
+
nDP_UARR = mkNDPModule FSLIT("Data.Array.Parallel.Unlifted.Flat.UArr")
nDP_PARRAY = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
nDP_REPR = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Repr")
nDP_UARR = mkNDPModule FSLIT("Data.Array.Parallel.Unlifted.Flat.UArr")
nDP_PARRAY = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray")
nDP_REPR = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Repr")
@@
-201,7
+196,7
@@
initBuiltins
}
initBuiltinVars :: Builtins -> DsM [(Var, Var)]
}
initBuiltinVars :: Builtins -> DsM [(Var, Var)]
-initBuiltinVars bi
+initBuiltinVars _
= do
uvars <- zipWithM externalVar umods ufs
vvars <- zipWithM externalVar vmods vfs
= do
uvars <- zipWithM externalVar umods ufs
vvars <- zipWithM externalVar vmods vfs
@@
-281,7
+276,7
@@
defaultTyCons :: [TyCon]
defaultTyCons = [intTyCon, boolTyCon, doubleTyCon]
initBuiltinDataCons :: Builtins -> [(Name, DataCon)]
defaultTyCons = [intTyCon, boolTyCon, doubleTyCon]
initBuiltinDataCons :: Builtins -> [(Name, DataCon)]
-initBuiltinDataCons bi = [(dataConName dc, dc)| dc <- defaultDataCons]
+initBuiltinDataCons _ = [(dataConName dc, dc)| dc <- defaultDataCons]
defaultDataCons :: [DataCon]
defaultDataCons = [trueDataCon, falseDataCon, unitDataCon]
defaultDataCons :: [DataCon]
defaultDataCons = [trueDataCon, falseDataCon, unitDataCon]
@@
-294,6
+289,7
@@
initBuiltinDicts ps
where
(tcs, mods, fss) = unzip3 ps
where
(tcs, mods, fss) = unzip3 ps
+initBuiltinPAs :: Builtins -> DsM [(Name, Var)]
initBuiltinPAs = initBuiltinDicts . builtinPAs
builtinPAs :: Builtins -> [(Name, Module, FastString)]
initBuiltinPAs = initBuiltinDicts . builtinPAs
builtinPAs :: Builtins -> [(Name, Module, FastString)]
@@
-317,6
+313,7
@@
builtinPAs bi
nDP_INSTANCES
(mkFastString $ "dPA_" ++ show n)
nDP_INSTANCES
(mkFastString $ "dPA_" ++ show n)
+initBuiltinPRs :: Builtins -> DsM [(Name, Var)]
initBuiltinPRs = initBuiltinDicts . builtinPRs
builtinPRs :: Builtins -> [(Name, Module, FastString)]
initBuiltinPRs = initBuiltinDicts . builtinPRs
builtinPRs :: Builtins -> [(Name, Module, FastString)]
@@
-348,7
+345,7
@@
initBuiltinBoxedTyCons :: Builtins -> DsM [(Name, TyCon)]
initBuiltinBoxedTyCons = return . builtinBoxedTyCons
builtinBoxedTyCons :: Builtins -> [(Name, TyCon)]
initBuiltinBoxedTyCons = return . builtinBoxedTyCons
builtinBoxedTyCons :: Builtins -> [(Name, TyCon)]
-builtinBoxedTyCons bi =
+builtinBoxedTyCons _ =
[(tyConName intPrimTyCon, intTyCon)]
externalVar :: Module -> FastString -> DsM Var
[(tyConName intPrimTyCon, intTyCon)]
externalVar :: Module -> FastString -> DsM Var
@@
-359,6
+356,7
@@
externalTyCon :: Module -> FastString -> DsM TyCon
externalTyCon mod fs
= dsLookupTyCon =<< lookupOrig mod (mkOccNameFS tcName fs)
externalTyCon mod fs
= dsLookupTyCon =<< lookupOrig mod (mkOccNameFS tcName fs)
+unitTyConName :: Name
unitTyConName = tyConName unitTyCon
unitTyConName = tyConName unitTyCon
@@
-378,6
+376,7
@@
primPArray tycon
| otherwise = return Nothing
| otherwise = return Nothing
+prim_ty_cons :: NameEnv String
prim_ty_cons = mkNameEnv [mk_prim intPrimTyCon]
where
mk_prim tycon = (tyConName tycon, '_' : getOccString tycon)
prim_ty_cons = mkNameEnv [mk_prim intPrimTyCon]
where
mk_prim tycon = (tyConName tycon, '_' : getOccString tycon)