X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Translator.hs;h=88f321eaf10e127f3cc20344f8363df96f7456b1;hb=b6830a33af7012bdacbb81010a9c0531ca0b037c;hp=7e66b181a2f72aef2d22c33e470d645c486fa1d8;hpb=7a5b4eb318626f327dd6b0d69e99a8247f56399c;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Translator.hs b/Translator.hs index 7e66b18..88f321e 100644 --- a/Translator.hs +++ b/Translator.hs @@ -116,7 +116,7 @@ flattenBind hsfunc bind@(NonRec var expr) = do let flatfunc = flattenFunction hsfunc bind addFunc hsfunc setFlatFunc hsfunc flatfunc - let used_hsfuncs = map appFunc (apps flatfunc) + let used_hsfuncs = map appFunc (flat_apps flatfunc) State.mapM resolvFunc used_hsfuncs return () @@ -186,9 +186,9 @@ nameFlatFunction hsfunc fdata = Nothing -> fdata -- Name the signals in all other functions Just flatfunc -> - let s = sigs flatfunc in + let s = flat_sigs flatfunc in let s' = map (\(id, (SignalInfo Nothing ty)) -> (id, SignalInfo (Just $ "sig_" ++ (show id)) ty)) s in - let flatfunc' = flatfunc { sigs = s' } in + let flatfunc' = flatfunc { flat_sigs = s' } in fdata { flatFunc = Just flatfunc' } -- | Splits a tuple type into a list of element types, or Nothing if the type