import qualified Control.Monad.State as State
import CoreSyn
+import qualified Type
import HsValueMap
} deriving (Show, Eq)
-- | Information on a signal definition
-data Signal sigid = Signal {
- id :: sigid
-} deriving (Eq, Show)
+data SignalInfo = SignalInfo {
+ sigName :: Maybe String,
+ sigTy :: Type.Type
+}
-- | A flattened function
data FlatFunction' sigid = FlatFunction {
res :: SignalMap sigid,
apps :: [FApp sigid],
conds :: [CondDef sigid],
- sigs :: [Signal sigid]
-} deriving (Show, Eq)
+ sigs :: [(sigid, SignalInfo)]
+}
-- | A flat function that does not have its signals named
type FlatFunction = FlatFunction' UnnamedSignal
)]
-- | 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 ()
State.put (apps, c:conds, sigs, n)
-- | Generates a new signal id, which is unique within the current flattening.
-genSignalId :: FlattenState UnnamedSignal
-genSignalId = do
+genSignalId :: Type.Type -> FlattenState UnnamedSignal
+genSignalId ty = do
(apps, conds, sigs, n) <- State.get
- let s = Signal n
+ -- Generate a new numbered but unnamed signal
+ let s = (n, SignalInfo Nothing ty)
State.put (apps, conds, s:sigs, n+1)
return n