WI #2014 make DumpDominators static

Author: mayanje

TypeCobol.Analysis.Test/CfgDfaDominatorTests.cs

@@ -1,7 +1,10 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.IO;
+using TypeCobol.Analysis.Graph;
 using TypeCobol.Test;
 using static TypeCobol.Analysis.Test.CfgTestUtils;
+using CFG = TypeCobol.Analysis.Graph.ControlFlowGraph<TypeCobol.Compiler.Nodes.Node,
+    TypeCobol.Analysis.Dfa.DfaBasicBlockInfo<TypeCobol.Compiler.Symbols.VariableSymbol>>;
 
 namespace TypeCobol.Analysis.Test
 {
@@ -19,7 +22,7 @@ public void HanoiPrgCfgExtendedDominator()
 
             string expectedDomsFile = Path.Combine(BasicCfgPrograms, "HanoiPrg.doms");
             StringWriter writer = new StringWriter();
-            dfaResults.Graphs[0].DumpDominators(blocks_dominators.Item2, writer);
+            CFG.DumpDominators(blocks_dominators.Item2, writer);
             // compare with expected result
             string result = writer.ToString();
             string expected = File.ReadAllText(expectedDomsFile);
@@ -36,7 +39,7 @@ private static void HanoiPrgCfgExtendedImmediateDominator(bool duplicate)
 
             string expectedDomsFile = Path.Combine(BasicCfgPrograms, "HanoiPrg.idoms");
             StringWriter writer = new StringWriter();
-            dfaResults.Graphs[0].DumpDominators(idoms, writer);
+            CFG.DumpDominators(idoms, writer);
             // compare with expected result
             string result = writer.ToString();
             string expected = File.ReadAllText(expectedDomsFile);

TypeCobol.Analysis/Graph/ControlFlowGraph.Dominator.cs

@@ -110,15 +110,14 @@ public BitSet[] ComputeImmediateDominators(List<int> blocks, BitSet[] dominators
         /// </summary>
         /// <param name="dominators">The set of Dominators</param>
         /// <param name="writer"></param>
-        public void DumpDominators(BitSet[] dominators, System.IO.TextWriter writer)
+        public static void DumpDominators(BitSet[] dominators, System.IO.TextWriter writer)
         {
             for (int i = 0; i < dominators.Length; i++)
             {
                 BitSet doms = dominators[i];
                 if (doms != null)
                 {
-                    BasicBlock<N, D> b = this.AllBlocks[i];
-                    writer.WriteLine($"Dominators[Block{b.Index}]={doms.ToString()}");
+                    writer.WriteLine($"Dominators[Block{i}]={doms.ToString()}");
                 }
             }
         }