Move VectCore to Vectorise tree

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 925014e..6251a8e 100644 (file)
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -455,10 +455,12 @@ Library
         UniqSet
         Util
         VectBuiltIn
         UniqSet
         Util
         VectBuiltIn

-        VectCore

         VectMonad
         VectType
         VectUtils
         VectMonad
         VectType
         VectUtils

+        VectVar
+        Vectorise.Env
+        Vectorise.Vect

         Vectorise
 
     -- We only need to expose more modules as some of the ncg code is used
         Vectorise
 
     -- We only need to expose more modules as some of the ncg code is used

diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs
index e24ed0e..6ac6d8d 100644 (file)
--- a/compiler/vectorise/VectMonad.hs
+++ b/compiler/vectorise/VectMonad.hs
@@ -39,6 +39,7 @@ module VectMonad (
 
 import VectBuiltIn
 import Vectorise.Env
 
 import VectBuiltIn
 import Vectorise.Env

+import Vectorise.Vect

 
 import HscTypes hiding  ( MonadThings(..) )
 import Module           ( PackageId )
 
 import HscTypes hiding  ( MonadThings(..) )
 import Module           ( PackageId )

diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs
index eec036a..5d8f2a8 100644 (file)
--- a/compiler/vectorise/VectType.hs
+++ b/compiler/vectorise/VectType.hs
@@ -8,8 +8,8 @@ where
 
 import VectMonad
 import VectUtils
 
 import VectMonad
 import VectUtils

-import VectCore

 import Vectorise.Env
 import Vectorise.Env

+import Vectorise.Vect

 
 import HscTypes          ( TypeEnv, extendTypeEnvList, typeEnvTyCons )
 import BasicTypes
 
 import HscTypes          ( TypeEnv, extendTypeEnvList, typeEnvTyCons )
 import BasicTypes

diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs
index 1b24f14..37dbecb 100644 (file)
--- a/compiler/vectorise/VectUtils.hs
+++ b/compiler/vectorise/VectUtils.hs
@@ -21,10 +21,9 @@ module VectUtils (
   buildClosure, buildClosures,
   mkClosureApp
 ) where
   buildClosure, buildClosures,
   mkClosureApp
 ) where

-
-import VectCore

 import VectMonad
 import Vectorise.Env
 import VectMonad
 import Vectorise.Env

+import Vectorise.Vect

 
 import MkCore ( mkCoreTup, mkWildCase )
 import CoreSyn
 
 import MkCore ( mkCoreTup, mkWildCase )
 import CoreSyn

diff --git a/compiler/vectorise/VectVar.hs b/compiler/vectorise/VectVar.hs
index 041a393..1c40ed9 100644 (file)
--- a/compiler/vectorise/VectVar.hs
+++ b/compiler/vectorise/VectVar.hs
@@ -11,10 +11,10 @@ module VectVar (
        vectLiteral
 ) where
 import VectUtils
        vectLiteral
 ) where
 import VectUtils

-import VectCore

 import VectMonad
 import VectType
 import Vectorise.Env
 import VectMonad
 import VectType
 import Vectorise.Env

+import Vectorise.Vect

 import CoreSyn
 import Type
 import Var
 import CoreSyn
 import Type
 import Var

diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs
index da10ff1..aad5144 100644 (file)
--- a/compiler/vectorise/Vectorise.hs
+++ b/compiler/vectorise/Vectorise.hs
@@ -7,7 +7,7 @@ import VectMonad
 import VectUtils
 import VectVar
 import VectType
 import VectUtils
 import VectVar
 import VectType

-import VectCore
+import Vectorise.Vect

 import Vectorise.Env
 
 import HscTypes hiding      ( MonadThings(..) )
 import Vectorise.Env
 
 import HscTypes hiding      ( MonadThings(..) )

diff --git a/compiler/vectorise/VectCore.hs b/compiler/vectorise/Vectorise/Vect.hs
similarity index 92%
rename from compiler/vectorise/VectCore.hs
rename to compiler/vectorise/Vectorise/Vect.hs
index 39341ef..6dcffa2 100644 (file)
--- a/compiler/vectorise/VectCore.hs
+++ b/compiler/vectorise/Vectorise/Vect.hs
@@ -1,22 +1,24 @@
 
 -- | Simple vectorised constructors and projections.
 
 -- | 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
 ) where

-
-#include "HsVersions.h"
-

 import CoreSyn
 import Type           ( Type )
 import Var
 import CoreSyn
 import Type           ( Type )
 import Var