projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove empty dir
[ghc-hetmet.git]
/
ghc
/
compiler
/
ndpFlatten
/
PArrAnal.hs
diff --git
a/ghc/compiler/ndpFlatten/PArrAnal.hs
b/ghc/compiler/ndpFlatten/PArrAnal.hs
index
0c25805
..
2db5622
100644
(file)
--- a/
ghc/compiler/ndpFlatten/PArrAnal.hs
+++ b/
ghc/compiler/ndpFlatten/PArrAnal.hs
@@
-42,6
+42,7
@@
import TypeRep (Type(..))
import Var (Var(..),Id)
import Literal (Literal)
import CoreSyn (Expr(..),CoreExpr,Bind(..))
import Var (Var(..),Id)
import Literal (Literal)
import CoreSyn (Expr(..),CoreExpr,Bind(..))
+import PprCore ( {- instances -} )
--
data ArrayUsage = Prim | NonPrim | Array
--
data ArrayUsage = Prim | NonPrim | Array
@@
-74,7
+75,7
@@
arrUsage (Let (Rec bnds) expr) =
t2 = arrUsage expr
in if isArrayUsage t1 then Array else t2
t2 = arrUsage expr
in if isArrayUsage t1 then Array else t2
-arrUsage (Case expr b alts) =
+arrUsage (Case expr b _ alts) =
let
t1 = arrUsage expr
t2 = scanType (map (arrUsage . (\ (_,_,x) -> x)) alts)
let
t1 = arrUsage expr
t2 = scanType (map (arrUsage . (\ (_,_,x) -> x)) alts)
@@
-135,8
+136,8
@@
typeArrayUsage (TyConApp tc tcargs) =
tcargsAU = map typeArrayUsage tcargs
tcCombine = foldr combineArrayUsage Prim tcargsAU
in auCon tcCombine
tcargsAU = map typeArrayUsage tcargs
tcCombine = foldr combineArrayUsage Prim tcargsAU
in auCon tcCombine
-typeArrayUsage t@(SourceTy _) =
- pprPanic "PArrAnal.typeArrayUsage: encountered 'SourceType - shouldn't be here!"
+typeArrayUsage t@(PredTy _) =
+ pprPanic "PArrAnal.typeArrayUsage: encountered 'PredType - shouldn't be here!"
(ppr t)
(ppr t)