Commit 02c988e5 authored by benl@ouroborus.net's avatar benl@ouroborus.net
Browse files

Move VectCore to Vectorise tree

parent cb482d83
...@@ -455,10 +455,12 @@ Library ...@@ -455,10 +455,12 @@ Library
UniqSet UniqSet
Util Util
VectBuiltIn VectBuiltIn
VectCore
VectMonad VectMonad
VectType VectType
VectUtils VectUtils
VectVar
Vectorise.Env
Vectorise.Vect
Vectorise Vectorise
-- We only need to expose more modules as some of the ncg code is used -- We only need to expose more modules as some of the ncg code is used
......
...@@ -39,6 +39,7 @@ module VectMonad ( ...@@ -39,6 +39,7 @@ module VectMonad (
import VectBuiltIn import VectBuiltIn
import Vectorise.Env import Vectorise.Env
import Vectorise.Vect
import HscTypes hiding ( MonadThings(..) ) import HscTypes hiding ( MonadThings(..) )
import Module ( PackageId ) import Module ( PackageId )
......
...@@ -8,8 +8,8 @@ where ...@@ -8,8 +8,8 @@ where
import VectMonad import VectMonad
import VectUtils import VectUtils
import VectCore
import Vectorise.Env import Vectorise.Env
import Vectorise.Vect
import HscTypes ( TypeEnv, extendTypeEnvList, typeEnvTyCons ) import HscTypes ( TypeEnv, extendTypeEnvList, typeEnvTyCons )
import BasicTypes import BasicTypes
......
...@@ -21,10 +21,9 @@ module VectUtils ( ...@@ -21,10 +21,9 @@ module VectUtils (
buildClosure, buildClosures, buildClosure, buildClosures,
mkClosureApp mkClosureApp
) where ) where
import VectCore
import VectMonad import VectMonad
import Vectorise.Env import Vectorise.Env
import Vectorise.Vect
import MkCore ( mkCoreTup, mkWildCase ) import MkCore ( mkCoreTup, mkWildCase )
import CoreSyn import CoreSyn
......
...@@ -11,10 +11,10 @@ module VectVar ( ...@@ -11,10 +11,10 @@ module VectVar (
vectLiteral vectLiteral
) where ) where
import VectUtils import VectUtils
import VectCore
import VectMonad import VectMonad
import VectType import VectType
import Vectorise.Env import Vectorise.Env
import Vectorise.Vect
import CoreSyn import CoreSyn
import Type import Type
import Var import Var
......
...@@ -7,7 +7,7 @@ import VectMonad ...@@ -7,7 +7,7 @@ import VectMonad
import VectUtils import VectUtils
import VectVar import VectVar
import VectType import VectType
import VectCore import Vectorise.Vect
import Vectorise.Env import Vectorise.Env
import HscTypes hiding ( MonadThings(..) ) import HscTypes hiding ( MonadThings(..) )
......
-- | Simple vectorised constructors and projections. -- | Simple vectorised constructors and projections.
module VectCore ( module Vectorise.Vect (
Vect, VVar, VExpr, VBind, Vect, VVar, VExpr, VBind,
vectorised, lifted, vectorised,
mapVect, lifted,
mapVect,
vVarType,
vVarType,
vNonRec, vRec, vNonRec,
vRec,
vVar, vType, vNote, vLet, vVar,
vLams, vLamsWithoutLC, vVarApps, vType,
vCaseDEFAULT vNote,
vLet,
vLams,
vLamsWithoutLC,
vVarApps,
vCaseDEFAULT
) where ) where
#include "HsVersions.h"
import CoreSyn import CoreSyn
import Type ( Type ) import Type ( Type )
import Var import Var
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment