X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Flatten.hs;h=e550db8b695045a808bc97f6dc570fb15051c8e2;hb=a07f47bf0b471c935e3e76e814b2f6ebfb298d35;hp=8a230162daf6f43cf21036390c6a072ae261ce8d;hpb=41e6a89a1d9347431e80b895cb74ab5ecc03e9b7;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Flatten.hs b/Flatten.hs index 8a23016..e550db8 100644 --- a/Flatten.hs +++ b/Flatten.hs @@ -25,7 +25,7 @@ dataConAppArgs dc args = genSignalUses :: Type.Type - -> FlattenState SignalUseMap + -> FlattenState (SignalUseMap UnnamedSignal) genSignalUses ty = do typeMapToUseMap tymap @@ -35,7 +35,7 @@ genSignalUses ty = do typeMapToUseMap :: HsValueMap Type.Type - -> FlattenState SignalUseMap + -> FlattenState (SignalUseMap UnnamedSignal) typeMapToUseMap (Single ty) = do id <- genSignalId @@ -63,7 +63,7 @@ flattenFunction hsfunc bind@(NonRec var expr) = flattenExpr :: BindMap -> CoreExpr - -> FlattenState ([SignalDefMap], SignalUseMap) + -> FlattenState ([SignalDefMap UnnamedSignal], (SignalUseMap UnnamedSignal)) flattenExpr binds lam@(Lam b expr) = do -- Find the type of the binder @@ -154,7 +154,7 @@ flattenExpr binds expr@(Case (Var v) b _ alts) = -> Var.Var -- The scrutinee -> CoreBndr -- The binder to bind the scrutinee to -> CoreAlt -- The single alternative - -> FlattenState ( [SignalDefMap], SignalUseMap) + -> FlattenState ( [SignalDefMap UnnamedSignal], SignalUseMap UnnamedSignal) -- See expandExpr flattenSingleAltCaseExpr binds v b alt@(DataAlt datacon, bind_vars, expr) = if not (DataCon.isTupleCon datacon)