Create an entity for each function.

[matthijs/master-project/cλash.git] / TranslatorTypes.hs

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index cad096bff8c692ec03437ff4e6fe4e7b6818d1b0..75967c2d4c94e1672feed90ea6d1b715cc056c4d 100644 (file)
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -5,9 +5,12 @@
 module TranslatorTypes where
 
 import qualified Control.Monad.State as State
-import qualified HscTypes
 import qualified Data.Map as Map
+
+import qualified HscTypes
+
 import FlattenTypes
+import VHDLTypes
 import HsValueMap
 
 
@@ -15,15 +18,10 @@ import HsValueMap
 --   function along the way.
 type FuncMap  = Map.Map HsFunction FuncData
 
--- | A signal that has been assigned a (unique) name
-data NamedSignal = NamedSignal String
-
--- | A function in which all signals have been assigned unique names
-type NamedFlatFunction = FlatFunction' NamedSignal
-
 -- | Some stuff we collect about a function along the way.
 data FuncData = FuncData {
-  flatFunc :: Maybe (Either FlatFunction NamedFlatFunction)
+  flatFunc :: Maybe FlatFunction,
+  entity   :: Maybe Entity
 }
 
 data VHDLSession = VHDLSession {
@@ -36,7 +34,7 @@ data VHDLSession = VHDLSession {
 addFunc :: HsFunction -> VHDLState ()
 addFunc hsfunc = do
   fs <- State.gets funcs -- Get the funcs element from the session
-  let fs' = Map.insert hsfunc (FuncData Nothing) fs -- Insert function
+  let fs' = Map.insert hsfunc (FuncData Nothing Nothing) fs -- Insert function
   State.modify (\x -> x {funcs = fs' })
 
 -- | Find the given function in the current session
@@ -46,12 +44,19 @@ getFunc hsfunc = do
   return $ Map.lookup hsfunc fs
 
 -- | Sets the FlatFunction for the given HsFunction in the given setting.
-setFlatFunc :: HsFunction -> (Either FlatFunction NamedFlatFunction) -> VHDLState ()
+setFlatFunc :: HsFunction -> FlatFunction -> VHDLState ()
 setFlatFunc hsfunc flatfunc = do
   fs <- State.gets funcs -- Get the funcs element from the session
   let fs'= Map.adjust (\d -> d { flatFunc = Just flatfunc }) hsfunc fs
   State.modify (\x -> x {funcs = fs' })
 
+-- | Modify all functions in the map using the given function
+modFuncs :: (HsFunction -> FuncData -> FuncData) -> VHDLState ()
+modFuncs f = do
+  fs <- State.gets funcs -- Get the funcs element from the session
+  let fs' = Map.mapWithKey f fs
+  State.modify (\x -> x {funcs = fs' })
+
 getModule :: VHDLState HscTypes.CoreModule
 getModule = State.gets coreMod -- Get the coreMod element from the session