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

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 8db0b5f..cad096b 100644
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -6,14 +6,25 @@ module TranslatorTypes where
 
 import qualified Control.Monad.State as State
 import qualified HscTypes
-import Flatten
+import qualified Data.Map as Map
+import FlattenTypes
+import HsValueMap
 
 
 -- | A map from a HsFunction identifier to various stuff we collect about a
 --   function along the way.
-type FuncMap  = [(HsFunction, FuncData)]
+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.
-type FuncData = (FlatFunction)
+data FuncData = FuncData {
+  flatFunc :: Maybe (Either FlatFunction NamedFlatFunction)
+}
 
 data VHDLSession = VHDLSession {
   coreMod   :: HscTypes.CoreModule, -- The current module
@@ -22,16 +33,24 @@ data VHDLSession = VHDLSession {
 }
 
 -- | Add the function to the session
-addFunc :: HsFunction -> FlatFunction -> VHDLState ()
-addFunc hsfunc flatfunc = do
+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 $ lookup hsfunc fs
+  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