X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=TranslatorTypes.hs;h=75967c2d4c94e1672feed90ea6d1b715cc056c4d;hb=fcd5e88b1c14a3129253de9e8c225e3b13e041e7;hp=72cd3981f97624175c816c50fd094fc330a4b9ae;hpb=40ece4d80b50d59c781b9bc157f5379c3a3bb14a;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 72cd398..75967c2 100644
--- 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
 
 
@@ -17,7 +20,8 @@ type FuncMap  = Map.Map HsFunction FuncData
 
 -- | Some stuff we collect about a function along the way.
 data FuncData = FuncData {
-  flatFunc :: Maybe FlatFunction
+  flatFunc :: Maybe FlatFunction,
+  entity   :: Maybe Entity
 }
 
 data VHDLSession = VHDLSession {
@@ -30,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,10 +50,11 @@ setFlatFunc hsfunc flatfunc = do
   let fs'= Map.adjust (\d -> d { flatFunc = Just flatfunc }) hsfunc fs
   State.modify (\x -> x {funcs = fs' })
 
-modFunc :: HsFunction -> (HsFunction -> FuncData -> FuncData) -> VHDLState ()
-modFunc hsfunc f = do
+-- | 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.adjustWithKey f hsfunc fs
+  let fs' = Map.mapWithKey f fs
   State.modify (\x -> x {funcs = fs' })
 
 getModule :: VHDLState HscTypes.CoreModule