} deriving (Show, Eq)
-- | Information on a signal definition
-data Signal sigid = Signal {
- id :: sigid,
+data SignalInfo = SignalInfo {
name :: Maybe String
} deriving (Eq, Show)
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
)]
-- | 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 ()
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