From a4424ee82db6094a87dbb68966c094c087eb67dc Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 27 Feb 2008 20:05:47 +0000 Subject: [PATCH] Fixed a few dependencies in the pass lists relating to functions --- transformations/SimplifyProcs.hs | 2 +- transformations/Unnest.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/transformations/SimplifyProcs.hs b/transformations/SimplifyProcs.hs index 64e9168..8bc713b 100644 --- a/transformations/SimplifyProcs.hs +++ b/transformations/SimplifyProcs.hs @@ -32,7 +32,7 @@ import Types simplifyProcs :: [Pass] simplifyProcs = makePassesDep [ ("Wrap PAR subprocesses in PROCs", parsToProcs, [Prop.parUsageChecked], [Prop.parsWrapped]) - , ("Remove parallel assignment", removeParAssign, [Prop.parUsageChecked, Prop.functionsRemoved], [Prop.assignParRemoved]) + , ("Remove parallel assignment", removeParAssign, [Prop.parUsageChecked, Prop.functionsRemoved, Prop.functionCallsRemoved], [Prop.assignParRemoved]) , ("Flatten assignment", flattenAssign, Prop.agg_typesDone ++ [Prop.assignParRemoved], [Prop.assignFlattened]) ] diff --git a/transformations/Unnest.hs b/transformations/Unnest.hs index 7ead897..aff9180 100644 --- a/transformations/Unnest.hs +++ b/transformations/Unnest.hs @@ -35,7 +35,7 @@ import Types unnest :: [Pass] unnest = makePassesDep - [ ("Convert free names to arguments", removeFreeNames, [Prop.mainTagged, Prop.parsWrapped], [Prop.freeNamesToArgs]) + [ ("Convert free names to arguments", removeFreeNames, [Prop.mainTagged, Prop.parsWrapped, Prop.functionCallsRemoved], [Prop.freeNamesToArgs]) , ("Pull nested definitions to top level", removeNesting, [Prop.freeNamesToArgs], [Prop.nestedPulled]) ]