From a560d671c6846c4ac606121d3593ebada412d11c Mon Sep 17 00:00:00 2001 From: anabra Date: Sat, 1 Feb 2020 19:36:58 +0100 Subject: [PATCH] ES: merge fixes --- grin/grin.cabal | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/grin/grin.cabal b/grin/grin.cabal index 0b6a0b6b..9a645a83 100644 --- a/grin/grin.cabal +++ b/grin/grin.cabal @@ -146,23 +146,23 @@ library Transformations.ExtendedSyntax.GenerateEval Transformations.ExtendedSyntax.MangleNames Transformations.ExtendedSyntax.StaticSingleAssignment + Transformations.ExtendedSyntax.Optimising.ArityRaising Transformations.ExtendedSyntax.Optimising.CaseCopyPropagation Transformations.ExtendedSyntax.Optimising.CaseHoisting - Transformations.ExtendedSyntax.Optimising.ArityRaising - Transformations.ExtendedSyntax.Optimising.CopyPropagation Transformations.ExtendedSyntax.Optimising.ConstantPropagation + Transformations.ExtendedSyntax.Optimising.CopyPropagation Transformations.ExtendedSyntax.Optimising.CSE - Transformations.ExtendedSyntax.Optimising.DeadParameterElimination Transformations.ExtendedSyntax.Optimising.DeadFunctionElimination Transformations.ExtendedSyntax.Optimising.DeadDataElimination + Transformations.ExtendedSyntax.Optimising.DeadParameterElimination Transformations.ExtendedSyntax.Optimising.EvaluatedCaseElimination + Transformations.ExtendedSyntax.Optimising.GeneralizedUnboxing + Transformations.ExtendedSyntax.Optimising.Inlining Transformations.ExtendedSyntax.Optimising.NonSharedElimination - Transformations.ExtendedSyntax.Optimising.SparseCaseOptimisation Transformations.ExtendedSyntax.Optimising.SimpleDeadVariableElimination Transformations.ExtendedSyntax.Optimising.SimpleDeadFunctionElimination Transformations.ExtendedSyntax.Optimising.SimpleDeadParameterElimination - Transformations.ExtendedSyntax.Optimising.Inlining - Transformations.ExtendedSyntax.Optimising.GeneralizedUnboxing + Transformations.ExtendedSyntax.Optimising.SparseCaseOptimisation Transformations.ExtendedSyntax.Optimising.TrivialCaseElimination Transformations.BindNormalisation @@ -315,22 +315,23 @@ test-suite grin-test Transformations.ExtendedSyntax.ConversionSpec Transformations.ExtendedSyntax.MangleNamesSpec Transformations.ExtendedSyntax.StaticSingleAssignmentSpec + Transformations.ExtendedSyntax.Optimising.ArityRaisingSpec Transformations.ExtendedSyntax.Optimising.CaseCopyPropagationSpec Transformations.ExtendedSyntax.Optimising.CaseHoistingSpec - Transformations.ExtendedSyntax.Optimising.ArityRaisingSpec + Transformations.ExtendedSyntax.Optimising.ConstantPropagationSpec Transformations.ExtendedSyntax.Optimising.CopyPropagationSpec Transformations.ExtendedSyntax.Optimising.CSESpec - Transformations.ExtendedSyntax.Optimising.DeadFunctionEliminationSpec Transformations.ExtendedSyntax.Optimising.DeadDataEliminationSpec + Transformations.ExtendedSyntax.Optimising.DeadFunctionEliminationSpec + Transformations.ExtendedSyntax.Optimising.DeadParameterEliminationSpec Transformations.ExtendedSyntax.Optimising.EvaluatedCaseEliminationSpec + Transformations.ExtendedSyntax.Optimising.GeneralizedUnboxingSpec + Transformations.ExtendedSyntax.Optimising.InliningSpec Transformations.ExtendedSyntax.Optimising.NonSharedEliminationSpec - Transformations.ExtendedSyntax.Optimising.SparseCaseOptimisationSpec Transformations.ExtendedSyntax.Optimising.SimpleDeadVariableEliminationSpec Transformations.ExtendedSyntax.Optimising.SimpleDeadFunctionEliminationSpec Transformations.ExtendedSyntax.Optimising.SimpleDeadParameterEliminationSpec - Transformations.ExtendedSyntax.Optimising.InliningSpec - Transformations.ExtendedSyntax.Optimising.GeneralizedUnboxingSpec - Transformations.ExtendedSyntax.Optimising.DeadParameterEliminationSpec + Transformations.ExtendedSyntax.Optimising.SparseCaseOptimisationSpec Transformations.ExtendedSyntax.Optimising.TrivialCaseEliminationSpec Transformations.Simplifying.RegisterIntroductionSpec