WI #2022 Change review

Author: mayanje

TypeCobol.Analysis/Cfg/ControlFlowGraphBuilder.CfgAfterIterativePerformProcedureTransformer.cs

@@ -12,15 +12,12 @@ public partial class ControlFlowGraphBuilder<D>
         private class CfgAfterIterativePerformProcedureTransformer : ICfgTransform<Node, D>
         {
             private HashSet<BasicBlockForNodeGroup> _visitedGroups;
-            private ControlFlowGraph<Node, D> _cfg;
 
             /// <summary>
             /// Constructor
             /// </summary>
-            /// <param name="builder"></param>
-            public CfgAfterIterativePerformProcedureTransformer(ControlFlowGraph<Node, D> cfg)
+            public CfgAfterIterativePerformProcedureTransformer()
             {
-                this._cfg = cfg;
             }
             private bool Callback(BasicBlock<Node, D> block, int incomingEdge, BasicBlock<Node, D> predecessorBlock, ControlFlowGraph<Node, D> cfg)
             {
@@ -57,7 +54,7 @@ private bool Callback(BasicBlock<Node, D> block, int incomingEdge, BasicBlock<No
                     cfg.SuccessorEdges.Add(iterativeGroup.Group.First.Value);
                     block.SuccessorEdges.Add(entranceEdge);
                     System.Diagnostics.Debug.Assert(block.Context == null);
-                    //If the assert above fails (it should not be case), then it will be necessay to exeute the commented code bellow.
+                    //If the assert above fails (it should not be case), then it will be necessary to exeute the commented code below.
                     //if(block.Context != null)
                     //{
                     //    ((MultiBranchContext)block.Context).ChangeSuccessor(_cfg, iterativeGroup, iterativeGroup.Group.First.Value);

TypeCobol.Analysis/Cfg/ControlFlowGraphBuilder.MultiBranchContext.cs

@@ -18,11 +18,11 @@ internal class MultiBranchContext : IMultiBranchContext<Node, D>
             /// <summary>
             /// List of multi branch blocks
             /// </summary>
-            internal List<BasicBlock<Node, D>> Branches;
+            public IList<BasicBlock<Node, D>> Branches { get; internal set; }
             /// <summary>
             /// Indices in the SuccessorEdges of all blocks in Branches
             /// </summary>
-            internal List<int> BranchIndices;
+            public IList<int> BranchIndices { get; internal set; }
             /// <summary>
             /// Root Block of the multi branches
             /// </summary>
@@ -62,10 +62,6 @@ internal class MultiBranchContext : IMultiBranchContext<Node, D>
 
             BasicBlock<Node, D> IMultiBranchContext<Node, D>.RootBlock => this.RootBlock;
 
-            IList<BasicBlock<Node, D>> IMultiBranchContext<Node, D>.Branches => this.Branches;
-
-            IList<int> IMultiBranchContext<Node, D>.BranchIndices => this.BranchIndices;
-
             /// <summary>
             /// Constructor
             /// </summary>            

TypeCobol.Analysis/Cfg/ControlFlowGraphBuilder.cs

@@ -1333,7 +1333,7 @@ private void HandlePerformsWithTestAfter()
             {
                 //Transform graph to replace edge in performs with test after.
                 //Transformation is directly applied to the graph, no new instance created.
-                ICfgTransform<Node, D> transform = new CfgAfterIterativePerformProcedureTransformer(this.CurrentProgramCfgBuilder.Cfg);
+                ICfgTransform<Node, D> transform = new CfgAfterIterativePerformProcedureTransformer();
                 transform.Transform(this.CurrentProgramCfgBuilder.Cfg);
             }
         }

TypeCobol.Analysis/Graph/IMultiBranchContext.cs

@@ -46,6 +46,5 @@ public interface IMultiBranchContext<N, D>
         /// For instance in COBOL EVALUATE Context has all WHEN and WHENOTHER as sub contexts.
         /// </summary>
         IList<IMultiBranchContext<N, D>> SubContexts { get; }
-
     }
 }