Move VectCore to Vectorise tree

compiler/ghc.cabal.in

@@ -455,10 +455,12 @@ Library
         UniqSet
         Util
         VectBuiltIn
-        VectCore
         VectMonad
         VectType
         VectUtils
+        VectVar
+        Vectorise.Env
+        Vectorise.Vect
         Vectorise
 
     -- We only need to expose more modules as some of the ncg code is used

compiler/vectorise/VectMonad.hs

@@ -39,6 +39,7 @@ module VectMonad (
 
 import VectBuiltIn
 import Vectorise.Env
+import Vectorise.Vect
 
 import HscTypes hiding  ( MonadThings(..) )
 import Module           ( PackageId )

compiler/vectorise/VectType.hs

@@ -8,8 +8,8 @@ where
 
 import VectMonad
 import VectUtils
-import VectCore
 import Vectorise.Env
+import Vectorise.Vect
 
 import HscTypes          ( TypeEnv, extendTypeEnvList, typeEnvTyCons )
 import BasicTypes

compiler/vectorise/VectUtils.hs

@@ -21,10 +21,9 @@ module VectUtils (
   buildClosure, buildClosures,
   mkClosureApp
 ) where
-
-import VectCore
 import VectMonad
 import Vectorise.Env
+import Vectorise.Vect
 
 import MkCore ( mkCoreTup, mkWildCase )
 import CoreSyn

compiler/vectorise/VectVar.hs

@@ -11,10 +11,10 @@ module VectVar (
 	vectLiteral
 ) where
 import VectUtils
-import VectCore
 import VectMonad
 import VectType
 import Vectorise.Env
+import Vectorise.Vect
 import CoreSyn
 import Type
 import Var

compiler/vectorise/Vectorise.hs

@@ -7,7 +7,7 @@ import VectMonad
 import VectUtils
 import VectVar
 import VectType
-import VectCore
+import Vectorise.Vect
 import Vectorise.Env
 
 import HscTypes hiding      ( MonadThings(..) )

compiler/vectorise/VectCore.hs → compiler/vectorise/Vectorise/Vect.hs

 
 -- | Simple vectorised constructors and projections.
-module VectCore (
-  Vect, VVar, VExpr, VBind,
-
-  vectorised, lifted,
-  mapVect,
-
-  vVarType,
-
-  vNonRec, vRec,
-
-  vVar, vType, vNote, vLet,
-  vLams, vLamsWithoutLC, vVarApps,
-  vCaseDEFAULT
+module Vectorise.Vect (
+	Vect, VVar, VExpr, VBind,
+
+	vectorised,
+	lifted,
+	mapVect,
+
+	vVarType,
+	vNonRec,
+	vRec,
+	vVar,
+	vType,
+	vNote,
+	vLet,
+	vLams,
+	vLamsWithoutLC,
+	vVarApps,
+	vCaseDEFAULT
 ) where
-
-#include "HsVersions.h"
-
 import CoreSyn
 import Type           ( Type )
 import Var