Move VectType module to Vectorise tree

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index a405b76..bd8004a 100644 (file)
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -454,21 +454,21 @@ Library
         UniqFM
         UniqSet
         Util
-        VectType
         VectUtils
         Vectorise.Var
         Vectorise.Convert
         Vectorise.Env
         Vectorise.Vect
         Vectorise.Exp
-        Vectorise.Type.Type
-        Vectorise.Type.TyConDecl
-        Vectorise.Type.Classify
+        Vectorise.Type.Env
         Vectorise.Type.Repr
         Vectorise.Type.PData
         Vectorise.Type.PRepr
         Vectorise.Type.PADict
         Vectorise.Type.PRDict
+        Vectorise.Type.Type
+        Vectorise.Type.TyConDecl
+        Vectorise.Type.Classify
         Vectorise.Utils.Closure
         Vectorise.Utils.Hoisting
         Vectorise.Builtins.Base

diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs
index 22cba53..a296e89 100644 (file)
--- a/compiler/vectorise/Vectorise.hs
+++ b/compiler/vectorise/Vectorise.hs
@@ -3,7 +3,9 @@
 module Vectorise( vectorise )
 where
 
-import VectType
+import Vectorise.Type.Env
+import Vectorise.Type.Type
+import Vectorise.Convert
 import Vectorise.Utils.Hoisting
 import Vectorise.Exp
 import Vectorise.Vect

diff --git a/compiler/vectorise/Vectorise/Exp.hs b/compiler/vectorise/Vectorise/Exp.hs
index 1c2ee4c..95dbfb4 100644 (file)
--- a/compiler/vectorise/Vectorise/Exp.hs
+++ b/compiler/vectorise/Vectorise/Exp.hs
@@ -4,7 +4,7 @@ module Vectorise.Exp
        (vectPolyExpr)
 where
 import VectUtils
-import VectType
+import Vectorise.Type.Type
 import Vectorise.Utils.Closure
 import Vectorise.Utils.Hoisting
 import Vectorise.Var

diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/Vectorise/Type/Env.hs
similarity index 97%
rename from compiler/vectorise/VectType.hs
rename to compiler/vectorise/Vectorise/Type/Env.hs
index 11d69d6..2bc7177 100644 (file)
--- a/compiler/vectorise/VectType.hs
+++ b/compiler/vectorise/Vectorise/Type/Env.hs
@@ -1,21 +1,14 @@
 {-# OPTIONS -fno-warn-missing-signatures #-}
 
-module VectType ( 
-       vectTyCon,
-       vectAndLiftType,
-       vectType,
+module Vectorise.Type.Env ( 
        vectTypeEnv,
-        buildPADict,
-        fromVect
 )
 where
 import VectUtils
 import Vectorise.Env
-import Vectorise.Convert
 import Vectorise.Vect
 import Vectorise.Monad
 import Vectorise.Builtins
-import Vectorise.Type.Type
 import Vectorise.Type.TyConDecl
 import Vectorise.Type.Classify
 import Vectorise.Type.PADict

diff --git a/compiler/vectorise/Vectorise/Var.hs b/compiler/vectorise/Vectorise/Var.hs
index 38aa030..5a1dcb3 100644 (file)
--- a/compiler/vectorise/Vectorise/Var.hs
+++ b/compiler/vectorise/Vectorise/Var.hs
@@ -11,10 +11,10 @@ module Vectorise.Var (
        vectLiteral
 ) where
 import VectUtils
-import VectType
 import Vectorise.Monad
 import Vectorise.Env
 import Vectorise.Vect
+import Vectorise.Type.Type
 import CoreSyn
 import Type
 import Var