Put a TypeMark in a VHDLSignalmap.

diff --git a/VHDL.hs b/VHDL.hs
index 192714778d5605c40efd37dc2cc85dc1540890f4..df7eaf89b94facc56cf8a1aa86a8ea7ff62518ec 100644 (file)
--- a/VHDL.hs
+++ b/VHDL.hs
@@ -42,9 +42,9 @@ createEntity hsfunc fdata =
       in
         fdata { entity = Just entity' }
   where
-    mkMap :: Eq id => [(id, SignalInfo)] -> id -> AST.VHDLId
+    mkMap :: Eq id => [(id, SignalInfo)] -> id -> (AST.VHDLId, AST.TypeMark)
     mkMap sigmap id =
-      mkVHDLId nm
+      (mkVHDLId nm, vhdl_ty ty)
       where
         info = Maybe.fromMaybe
           (error $ "Signal not found in the name map? This should not happen!")
@@ -52,6 +52,7 @@ createEntity hsfunc fdata =
         nm = Maybe.fromMaybe
           (error $ "Signal not named? This should not happen!")
           (sigName info)
+        ty = sigTy info
 
 -- | Create the VHDL AST for an entity
 createEntityAST ::

diff --git a/VHDLTypes.hs b/VHDLTypes.hs
index 34a2b503dc4df4c51ef523363f40caf1cb47ce5f..44696479e6719de98c5f3f67bdcd6aa261b7e808 100644 (file)
--- a/VHDLTypes.hs
+++ b/VHDLTypes.hs
@@ -7,7 +7,7 @@ import qualified ForSyDe.Backend.VHDL.AST as AST
 
 import FlattenTypes
 
-type VHDLSignalMap = SignalMap AST.VHDLId
+type VHDLSignalMap = SignalMap (AST.VHDLId, AST.TypeMark)
 
 -- A description of a VHDL entity. Contains both the entity itself as well as
 -- info on how to map a haskell value (argument / result) on to the entity's