Store signals in a map.

This turns the list of Signals into a list of (sigid, SignalInfo), which
enables lookup by id.

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index b14ef387dc6f1300a0742a9ea2001f5f17ff4416..7838dcdcbc28563fa7f77d54063e21183b9a3cd6 100644 (file)
--- a/FlattenTypes.hs
+++ b/FlattenTypes.hs
@@ -75,8 +75,7 @@ data CondDef sigid = CondDef {
 } deriving (Show, Eq)
 
 -- | Information on a signal definition
-data Signal sigid = Signal {
-  id :: sigid,
+data SignalInfo = SignalInfo {
   name :: Maybe String
 } deriving (Eq, Show)
 
@@ -86,7 +85,7 @@ data FlatFunction' sigid = FlatFunction {
   res    :: SignalMap sigid,
   apps   :: [FApp sigid],
   conds  :: [CondDef sigid],
-  sigs   :: [Signal sigid]
+  sigs   :: [(sigid, SignalInfo)]
 } deriving (Show, Eq)
 
 -- | A flat function that does not have its signals named
@@ -105,7 +104,7 @@ type BindMap = [(
   )]
 
 -- | The state during the flattening of a single function
-type FlattenState = State.State ([FApp UnnamedSignal], [CondDef UnnamedSignal], [Signal UnnamedSignal], UnnamedSignal)
+type FlattenState = State.State ([FApp UnnamedSignal], [CondDef UnnamedSignal], [(UnnamedSignal, SignalInfo)], UnnamedSignal)
 
 -- | Add an application to the current FlattenState
 addApp :: (FApp UnnamedSignal) -> FlattenState ()
@@ -124,6 +123,6 @@ genSignalId :: FlattenState UnnamedSignal
 genSignalId = do
   (apps, conds, sigs, n) <- State.get
   -- Generate a new numbered but unnamed signal
-  let s = Signal n Nothing
+  let s = (n, SignalInfo Nothing)
   State.put (apps, conds, s:sigs, n+1)
   return n

diff --git a/Pretty.hs b/Pretty.hs
index ee4b3be78ec7c1facf6ea2402e753b943cf36f16..d4ed8f01d93da2ddcc46be08d6c5f83eed1db487 100644 (file)
--- a/Pretty.hs
+++ b/Pretty.hs
@@ -42,9 +42,9 @@ instance Pretty id => Pretty (FApp id) where
 instance Pretty id => Pretty (CondDef id) where
   pPrint _ = text "TODO"
 
-instance Pretty id => Pretty (Signal id) where
-  pPrint (Signal id Nothing) = pPrint id
-  pPrint (Signal id (Just name)) = pPrint id <> text ":" <> text name
+instance Pretty SignalInfo where
+  pPrint (SignalInfo Nothing) = empty
+  pPrint (SignalInfo (Just name)) = text ":" <> text name
 
 instance Pretty VHDLSession where
   pPrint (VHDLSession mod nameCount funcs) =

diff --git a/Translator.hs b/Translator.hs
index bb5845b6febe4f5d90185249d9cfcb1ced265d5e..6b96ebca98a04566fb07e0adaeec609fc94a5d77 100644 (file)
--- a/Translator.hs
+++ b/Translator.hs
@@ -181,7 +181,7 @@ nameFlatFunction hsfunc fdata =
     -- Name the signals in all other functions
     Just flatfunc ->
       let s = sigs flatfunc in
-      let s' = map (\(Signal id Nothing) -> Signal id (Just $ "sig_" ++ (show id))) s in
+      let s' = map (\(id, (SignalInfo Nothing)) -> (id, SignalInfo (Just $ "sig_" ++ (show id)))) s in
       let flatfunc' = flatfunc { sigs = s' } in
       fdata { flatFunc = Just flatfunc' }