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

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 8e24541..cad096b 100644
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -7,16 +7,23 @@ module TranslatorTypes where
 import qualified Control.Monad.State as State
 import qualified HscTypes
 import qualified Data.Map as Map
-import Flatten
+import FlattenTypes
+import HsValueMap
 
 
 -- | 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 FlatFunction
+  flatFunc :: Maybe (Either FlatFunction NamedFlatFunction)
 }
 
 data VHDLSession = VHDLSession {
@@ -39,7 +46,7 @@ getFunc hsfunc = do
   return $ Map.lookup hsfunc fs
 
 -- | Sets the FlatFunction for the given HsFunction in the given setting.
-setFlatFunc :: HsFunction -> FlatFunction -> VHDLState ()
+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