From b0fac1f82a15efa8569d3edff0fddbf56767eba7 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 27 Feb 2008 17:20:52 +0000 Subject: [PATCH] Made sure that definitions are only pulled up after protocol inputs have been flattened --- transformations/SimplifyExprs.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transformations/SimplifyExprs.hs b/transformations/SimplifyExprs.hs index 93b9983..48732ef 100644 --- a/transformations/SimplifyExprs.hs +++ b/transformations/SimplifyExprs.hs @@ -36,7 +36,7 @@ simplifyExprs = makePassesDep [ ("Convert FUNCTIONs to PROCs", functionsToProcs, Prop.agg_namesDone ++ [Prop.parUsageChecked], [Prop.functionsRemoved]) , ("Convert AFTER to MINUS", removeAfter, [Prop.expressionTypesChecked], [Prop.afterRemoved]) , ("Expand array literals", expandArrayLiterals, [Prop.expressionTypesChecked, Prop.processTypesChecked], [Prop.arrayLiteralsExpanded]) - , ("Pull up definitions", pullUp, Prop.agg_namesDone ++ [Prop.expressionTypesChecked, Prop.functionsRemoved, Prop.processTypesChecked], [Prop.functionCallsRemoved, Prop.subscriptsPulledUp]) + , ("Pull up definitions", pullUp, Prop.agg_namesDone ++ [Prop.expressionTypesChecked, Prop.functionsRemoved, Prop.processTypesChecked,Prop.seqInputsFlattened], [Prop.functionCallsRemoved, Prop.subscriptsPulledUp]) , ("Transform array constructors into initialisation code", transformConstr, Prop.agg_namesDone ++ Prop.agg_typesDone, []) ]