Reflect changes of desugarer error reporting in VectMonad.

[ghc-hetmet.git] / compiler / vectorise / VectUtils.hs

diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs
index 837a580..2c37f73 100644 (file)
--- a/compiler/vectorise/VectUtils.hs
+++ b/compiler/vectorise/VectUtils.hs
@@ -21,7 +21,7 @@ module VectUtils (
 import VectCore
 import VectMonad
 
-import DsUtils
+import MkCore
 import CoreSyn
 import CoreUtils
 import Coercion
@@ -57,8 +57,8 @@ collectAnnTypeBinders expr = go [] expr
 collectAnnValBinders :: AnnExpr Var ann -> ([Var], AnnExpr Var ann)
 collectAnnValBinders expr = go [] expr
   where
-    go bs (_, AnnLam b e) | isId b = go (b:bs) e
-    go bs e                        = (reverse bs, e)
+    go bs (_, AnnLam b e) | isIdVar b = go (b:bs) e
+    go bs e                           = (reverse bs, e)
 
 isAnnTypeArg :: AnnExpr b ann -> Bool
 isAnnTypeArg (_, AnnType _) = True
@@ -420,7 +420,7 @@ buildEnv vvs
                 return (vbody', lbody'))
   where
     (vs,ls) = unzip vvs
-    tys     = map idType vs
+    tys     = map varType vs
 
 mkVectEnv :: [Type] -> [Var] -> (Type, CoreExpr, CoreExpr -> CoreExpr -> CoreExpr)
 mkVectEnv []   []  = (unitTy, Var unitDataConId, \_ body -> body)