X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Flatten.hs;h=cd515859f0879755d9d7f6e704bfb241271d9fbc;hb=4e69cb591dcca330d8f2a8c2e09fa2026c8fc7f2;hp=1297793356dfa8e17223fd034086202ace7584be;hpb=1f0b33729534d451d7dcc46d4614d1a12b31ea82;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Flatten.hs b/Flatten.hs index 1297793..cd51585 100644 --- a/Flatten.hs +++ b/Flatten.hs @@ -38,7 +38,7 @@ typeMapToUseMap :: -> FlattenState (SignalMap UnnamedSignal) typeMapToUseMap (Single ty) = do - id <- genSignalId + id <- genSignalId ty return $ Single id typeMapToUseMap (Tuple tymaps) = do @@ -53,12 +53,12 @@ flattenFunction :: 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