projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved to new GHC API (6.11). Also use vhdl package for the VHDL AST
[matthijs/master-project/cλash.git]
/
VHDLTypes.hs
diff --git
a/VHDLTypes.hs
b/VHDLTypes.hs
index b9db66a485220276f060c18edcb9c1419efa1fa3..87120436510620829be57115f5f52ff15933114c 100644
(file)
--- a/
VHDLTypes.hs
+++ b/
VHDLTypes.hs
@@
-13,9
+13,10
@@
import qualified Data.Accessor.Template
-- GHC API imports
import qualified Type
import qualified CoreSyn
-- GHC API imports
import qualified Type
import qualified CoreSyn
+import qualified HscTypes
-- ForSyDe imports
-- ForSyDe imports
-import qualified
ForSyDe.Backend
.VHDL.AST as AST
+import qualified
Language
.VHDL.AST as AST
-- Local imports
-- Local imports
@@
-66,12
+67,11
@@
data TypeState = TypeState {
vsTypeDecls_ :: [AST.PackageDecItem],
-- | A map of vector Core type -> VHDL type function
vsTypeFuns_ :: TypeFunMap,
vsTypeDecls_ :: [AST.PackageDecItem],
-- | A map of vector Core type -> VHDL type function
vsTypeFuns_ :: TypeFunMap,
- vsTfpInts_ :: TfpIntMap
+ vsTfpInts_ :: TfpIntMap,
+ vsHscEnv_ :: HscTypes.HscEnv
}
-- Derive accessors
$( Data.Accessor.Template.deriveAccessors ''TypeState )
}
-- Derive accessors
$( Data.Accessor.Template.deriveAccessors ''TypeState )
--- Define an empty TypeState
-emptyTypeState = TypeState Map.empty [] Map.empty Map.empty
-- Define a session
type TypeSession = State.State TypeState
-- Define a session
type TypeSession = State.State TypeState