X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=TranslatorTypes.hs;h=cad096bff8c692ec03437ff4e6fe4e7b6818d1b0;hb=4fb701e41729143a897d43cd8a9c0217b8b3f68a;hp=733e65938bf84c20470de758e657be345e0fd990;hpb=8325780f83f31cc3520029912d0797704d058d7e;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 733e659..cad096b 100644
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -5,21 +5,55 @@
 module TranslatorTypes where
 
 import qualified Control.Monad.State as State
-import Flatten
+import qualified HscTypes
+import qualified Data.Map as Map
+import FlattenTypes
+import HsValueMap
 
-type FuncMap = [(HsFunction, 
-    (FlatFunction))]
+
+-- | A map from a HsFunction identifier to various stuff we collect about a
+--   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)
+}
 
 data VHDLSession = VHDLSession {
+  coreMod   :: HscTypes.CoreModule, -- The current module
   nameCount :: Int,             -- A counter that can be used to generate unique names
   funcs     :: FuncMap          -- A map from HsFunction to FlatFunction, HWFunction, VHDL Entity and Architecture
-} deriving (Show)
+}
 
--- Add the function to the session
-addFunc :: HsFunction -> FlatFunction -> VHDLState ()
-addFunc hsfunc flatfunc = do
+-- | Add the function to the session
+addFunc :: HsFunction -> VHDLState ()
+addFunc hsfunc = do
   fs <- State.gets funcs -- Get the funcs element from the session
-  State.modify (\x -> x {funcs = (hsfunc, flatfunc) : fs }) -- Prepend name and f
+  let fs' = Map.insert hsfunc (FuncData Nothing) fs -- Insert function
+  State.modify (\x -> x {funcs = fs' })
+
+-- | Find the given function in the current session
+getFunc :: HsFunction -> VHDLState (Maybe FuncData)
+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.
+setFlatFunc :: HsFunction -> (Either FlatFunction NamedFlatFunction) -> 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' })
+
+getModule :: VHDLState HscTypes.CoreModule
+getModule = State.gets coreMod -- Get the coreMod element from the session
 
 type VHDLState = State.State VHDLSession
 
@@ -32,3 +66,4 @@ uniqueName name = do
   State.modify (\s -> s {nameCount = count + 1})
   return $ name ++ "_" ++ (show count)
 
+-- vim: set ts=8 sw=2 sts=2 expandtab: