where
tycount = length $ DataCon.dataConAllTyVars dc
-genSignalUses ::
+genSignals ::
Type.Type
- -> FlattenState SignalUseMap
+ -> FlattenState (SignalMap UnnamedSignal)
-genSignalUses ty = do
+genSignals ty = do
typeMapToUseMap tymap
where
-- First generate a map with the right structure containing the types
typeMapToUseMap ::
HsValueMap Type.Type
- -> FlattenState SignalUseMap
+ -> FlattenState (SignalMap UnnamedSignal)
typeMapToUseMap (Single ty) = do
- id <- genSignalId
- return $ Single (SignalUse id)
+ id <- genSignalId ty
+ return $ Single id
typeMapToUseMap (Tuple tymaps) = do
usemaps <- State.mapM typeMapToUseMap tymaps
flattenFunction _ (Rec _) = error "Recursive binders not supported"
flattenFunction hsfunc bind@(NonRec var expr) =
- FlatFunction args res apps conds
+ FlatFunction args res apps conds sigs
where
- init_state = ([], [], 0)
+ init_state = ([], [], [], 0)
(fres, end_state) = State.runState (flattenExpr [] expr) init_state
(args, res) = fres
- (apps, conds, _) = end_state
+ (apps, conds, sigs, _) = end_state
flattenExpr ::
BindMap
-> CoreExpr
- -> FlattenState ([SignalDefMap], SignalUseMap)
+ -> FlattenState ([SignalMap UnnamedSignal], (SignalMap UnnamedSignal))
flattenExpr binds lam@(Lam b expr) = do
-- Find the type of the binder
let (arg_ty, _) = Type.splitFunTy (CoreUtils.exprType lam)
-- Create signal names for the binder
- defs <- genSignalUses arg_ty
+ defs <- genSignals arg_ty
let binds' = (b, Left defs):binds
(args, res) <- flattenExpr binds' expr
- return ((useMapToDefMap defs) : args, res)
+ return (defs : args, res)
flattenExpr binds (Var id) =
case bind of
-- Check and split each of the arguments
let (_, arg_ress) = unzip (zipWith checkArg args flat_args)
-- Generate signals for our result
- res <- genSignalUses ty
+ res <- genSignals ty
-- Create the function application
let app = FApp {
appFunc = func,
appArgs = arg_ress,
- appRes = useMapToDefMap res
+ appRes = res
}
addApp app
return ([], res)
-> Var.Var -- The scrutinee
-> CoreBndr -- The binder to bind the scrutinee to
-> CoreAlt -- The single alternative
- -> FlattenState ( [SignalDefMap], SignalUseMap)
+ -> FlattenState ( [SignalMap UnnamedSignal], SignalMap UnnamedSignal)
-- See expandExpr
flattenSingleAltCaseExpr binds v b alt@(DataAlt datacon, bind_vars, expr) =
if not (DataCon.isTupleCon datacon)