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

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 75967c2..9a521b8 100644
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -9,6 +9,8 @@ import qualified Data.Map as Map
 
 import qualified HscTypes
 
+import qualified ForSyDe.Backend.VHDL.AST as AST
+
 import FlattenTypes
 import VHDLTypes
 import HsValueMap
@@ -20,8 +22,9 @@ type FuncMap  = Map.Map HsFunction FuncData
 
 -- | Some stuff we collect about a function along the way.
 data FuncData = FuncData {
-  flatFunc :: Maybe FlatFunction,
-  entity   :: Maybe Entity
+  flatFunc     :: Maybe FlatFunction,
+  funcEntity   :: Maybe Entity,
+  funcArch     :: Maybe AST.ArchBody
 }
 
 data VHDLSession = VHDLSession {
@@ -32,10 +35,8 @@ data VHDLSession = VHDLSession {
 
 -- | Add the function to the session
 addFunc :: HsFunction -> VHDLState ()
-addFunc hsfunc = do
-  fs <- State.gets funcs -- Get the funcs element from the session
-  let fs' = Map.insert hsfunc (FuncData Nothing Nothing) fs -- Insert function
-  State.modify (\x -> x {funcs = fs' })
+addFunc hsfunc =
+  modFuncMap (Map.insert hsfunc (FuncData Nothing Nothing Nothing))
 
 -- | Find the given function in the current session
 getFunc :: HsFunction -> VHDLState (Maybe FuncData)
@@ -43,19 +44,59 @@ getFunc hsfunc = do
   fs <- State.gets funcs -- Get the funcs element from the session
   return $ Map.lookup hsfunc fs
 
--- | Sets the FlatFunction for the given HsFunction in the given setting.
+-- | Gets all functions from the current session
+getFuncs :: VHDLState [(HsFunction, FuncData)]
+getFuncs = do
+  fs <- State.gets funcs -- Get the funcs element from the session
+  return $ Map.toList fs
+
+-- | Gets all the functions from the current session
+getHsFuncs :: VHDLState [HsFunction]
+getHsFuncs = do
+  fs <- State.gets funcs -- Get the funcs element from the session
+  return $ Map.keys fs
+  
+-- | Sets the FlatFunction for the given HsFunction in the current session.
 setFlatFunc :: HsFunction -> FlatFunction -> VHDLState ()
-setFlatFunc hsfunc flatfunc = do
+setFlatFunc hsfunc flatfunc =
+  modFunc (\d -> d { flatFunc = Just flatfunc }) hsfunc
+
+-- | Sets the Entity for the given HsFunction in the current session.
+setEntity :: HsFunction -> Entity -> VHDLState ()
+setEntity hsfunc entity =
+  modFunc (\d -> d { funcEntity = Just entity }) hsfunc
+
+-- | Sets the Entity for the given HsFunction in the current session.
+setArchitecture :: HsFunction -> AST.ArchBody -> VHDLState ()
+setArchitecture hsfunc arch =
+  modFunc (\d -> d { funcArch = Just arch }) hsfunc
+
+-- | Modify a function in the map using the given function
+modFunc :: (FuncData -> FuncData) -> HsFunction -> VHDLState ()
+modFunc f hsfunc =
+  modFuncMap (Map.adjust f hsfunc)
+
+-- | Modify the function map in the session using the given function
+modFuncMap :: (FuncMap -> FuncMap) -> VHDLState ()
+modFuncMap f = do
   fs <- State.gets funcs -- Get the funcs element from the session
-  let fs'= Map.adjust (\d -> d { flatFunc = Just flatfunc }) hsfunc fs
+  let fs' = f fs
   State.modify (\x -> x {funcs = fs' })
 
--- | Modify all functions in the map using the given function
-modFuncs :: (HsFunction -> FuncData -> FuncData) -> VHDLState ()
+-- | Apply the given function to all functions in the map, and collect the
+--   results. The function is allowed to change the function map in the
+--   session, but any new functions added will not be mapped.
+modFuncs :: (HsFunction -> FuncData -> VHDLState ()) -> 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' })
+  hsfuncs <- getHsFuncs
+  mapM doFunc hsfuncs
+  return ()
+  where
+    doFunc hsfunc = do
+      fdata_maybe <- getFunc hsfunc
+      case fdata_maybe of
+        Nothing -> do return ()
+        Just fdata -> f hsfunc fdata
 
 getModule :: VHDLState HscTypes.CoreModule
 getModule = State.gets coreMod -- Get the coreMod element from the session