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