WI #2045 better handling 1 branch in multi branch case.

mayanje · mayanje · commit 95f26229733f · 2021-10-15T16:52:18.000+02:00
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/Declaratives1.int b/TypeCobol.Analysis.Test/BasicCfgInstrs/Declaratives1.int
@@ -71,4 +71,4 @@ Leaving block : 4
 =======
 METRICS
 =======
-{EdgeCount=28; NodeCount=24; ControlSubgraphCount=1; HighCyclomaticComplexity=6; HighEssentialComplexityPath=5}
+{EdgeCount=27; NodeCount=24; ControlSubgraphCount=1; HighCyclomaticComplexity=5; HighEssentialComplexityPath=4}
diff --git a/TypeCobol.Analysis/Graph/CfgAbstractInterpretation.Environment.cs b/TypeCobol.Analysis/Graph/CfgAbstractInterpretation.Environment.cs
@@ -98,7 +98,16 @@ protected virtual void Run(BasicBlock<N, D> startBlock, BasicBlock<N, D> stopBlo
                         }
                         else
                         {
-                            DFSStack.Push(nextFlowBlock);                            
+                            DFSStack.Push(nextFlowBlock);
+                            // If the multi branch context instruction has a successor
+                            // to the next flow block, add one edge.
+                            foreach (var edge in block.SuccessorEdges)
+                            {
+                                if (Cfg.SuccessorEdges[edge] == nextFlowBlock)
+                                {
+                                    Metrics.EdgeCount++;
+                                }
+                            }
                         }
                     }
                 }
@@ -184,8 +193,6 @@ private BasicBlock<N, D> InterpretContext(BasicBlock<N, D> block)
                         Metrics.EdgeCount++;
                         Run(CheckRelocatedBlock(block.Context, b), CheckRelocatedBlock(block.Context, block.Context.NextFlowBlock));
                     }
-                    // Special case exemple IF THEN Without and ELSE => add virtual else to next block
-                    Metrics.EdgeCount += block.Context.Branches.Count == 1 ? 1 : 0;
                 }
 
                 System.Diagnostics.Debug.Assert(this.InterpretationStack.Count > 0 &&

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,16 @@ protected virtual void Run(BasicBlock<N, D> startBlock, BasicBlock<N, D> stopBlo`
`98`	`98`	`}`
`99`	`99`	`else`
`100`	`100`	`{`
`101`		`- DFSStack.Push(nextFlowBlock);`
	`101`	`+ DFSStack.Push(nextFlowBlock);`
	`102`	`+ // If the multi branch context instruction has a successor`
	`103`	`+ // to the next flow block, add one edge.`
	`104`	`+ foreach (var edge in block.SuccessorEdges)`
	`105`	`+ {`
	`106`	`+ if (Cfg.SuccessorEdges[edge] == nextFlowBlock)`
	`107`	`+ {`
	`108`	`+ Metrics.EdgeCount++;`
	`109`	`+ }`
	`110`	`+ }`
`102`	`111`	`}`
`103`	`112`	`}`
`104`	`113`	`}`
`@@ -184,8 +193,6 @@ private BasicBlock<N, D> InterpretContext(BasicBlock<N, D> block)`
`184`	`193`	`Metrics.EdgeCount++;`
`185`	`194`	`Run(CheckRelocatedBlock(block.Context, b), CheckRelocatedBlock(block.Context, block.Context.NextFlowBlock));`
`186`	`195`	`}`
`187`		`- // Special case exemple IF THEN Without and ELSE => add virtual else to next block`
`188`		`- Metrics.EdgeCount += block.Context.Branches.Count == 1 ? 1 : 0;`
`189`	`196`	`}`
`190`	`197`
`191`	`198`	`System.Diagnostics.Debug.Assert(this.InterpretationStack.Count > 0 &&`