WI #2007 Set CFG checks severity according to their selected level

fm-117 · fm-117 · commit 754ee712fc05 · 2021-07-20T15:40:38.000+02:00
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformIdentity.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformIdentity.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 6[12,23] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM main', recursive instruction is '    PERFORM main'.
+Line 6[12,23] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM main', recursive instruction is '    PERFORM main'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc1Recursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc1Recursive0.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 16[15,29] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec'.
+Line 16[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc2Recursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc2Recursive0.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 27[15,29] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
+Line 27[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc3Recursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc3Recursive0.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 28[15,29] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
+Line 28[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc4Recursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc4Recursive0.diag
@@ -1,4 +1,4 @@
 --- Diagnostics ---
-Line 31[15,29] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
-Line 57[15,64] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec4', recursive instruction is '       perform pararec4 varying n from 1 by 1 until n > 5'.
-Line 57[15,64] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec4', recursive instruction is '       perform pararec3 test after varying n from 1 by 1 until n'.
+Line 31[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec2'.
+Line 57[15,64] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec4', recursive instruction is '       perform pararec4 varying n from 1 by 1 until n > 5'.
+Line 57[15,64] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec4', recursive instruction is '       perform pararec3 test after varying n from 1 by 1 until n'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive0.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 16[15,64] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec  varying n from 1 by 1 until n > 5'.
+Line 16[15,64] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec  varying n from 1 by 1 until n > 5'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive1.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive1.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 16[15,72] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec test after varying n from 1 by 1 until n>5'.
+Line 16[15,72] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec test after varying n from 1 by 1 until n>5'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive2.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive2.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 16[15,72] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec test after varying n from 1 by 1 until n>5'.
+Line 16[15,72] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec test after varying n from 1 by 1 until n>5'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeRecursive0.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeRecursive0.diag
@@ -1,2 +1,2 @@
 --- Diagnostics ---
-Line 16[15,64] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec  varying n from 1 by 1 until n > 5'.
+Line 16[15,64] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is '       perform pararec  varying n from 1 by 1 until n > 5'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformThru2.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/PerformThru2.diag
@@ -1,4 +1,4 @@
 --- Diagnostics ---
-Line 6[12,27] <30, Error, Semantics> - Semantic error: PERFORM 'B' THRU 'A': 'A' is declared before 'B'.
-Line 9[12,29] <30, Error, Semantics> - Semantic error: PERFORM 'S2' THRU 'S1': 'S1' is declared before 'S2'.
-Line 11[12,28] <30, Error, Semantics> - Semantic error: PERFORM 'S1' THRU 'A': 'A' is declared before 'S1'.
+Line 6[12,27] <37, Warning, General> - Warning: PERFORM 'B' THRU 'A': 'A' is declared before 'B'.
+Line 9[12,29] <37, Warning, General> - Warning: PERFORM 'S2' THRU 'S1': 'S1' is declared before 'S2'.
+Line 11[12,28] <37, Warning, General> - Warning: PERFORM 'S1' THRU 'A': 'A' is declared before 'S1'.
diff --git a/TypeCobol.Analysis.Test/BasicCfgInstrs/SG102A.diag b/TypeCobol.Analysis.Test/BasicCfgInstrs/SG102A.diag
@@ -9,10 +9,10 @@ Line 242[13,46] <37, Warning, General> - Warning: "end-if" is missing
 Line 250[12,37] <37, Warning, General> - Warning: "end-if" is missing
 Line 266[12,43] <37, Warning, General> - Warning: "end-if" is missing
 Line 267[12,42] <37, Warning, General> - Warning: "end-if" is missing
-Line 269[41,66] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '                                      PERFORM WRT-LN'.
-Line 269[41,66] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '                                      PERFORM WRT-LN 2 TIMES'.
-Line 269[41,66] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '                                         PERFORM WRT-LN'.
-Line 269[41,66] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '    PERFORM WRT-LN'.
+Line 269[41,66] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '                                      PERFORM WRT-LN'.
+Line 269[41,66] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '                                      PERFORM WRT-LN 2 TIMES'.
+Line 269[41,66] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '                                         PERFORM WRT-LN'.
+Line 269[41,66] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM WRITE-LINE', recursive instruction is '    PERFORM WRT-LN'.
 Line 276[12,43] <37, Warning, General> - Warning: "end-if" is missing
 Line 277[12,38] <37, Warning, General> - Warning: "end-if" is missing
 Line 293[12,16] <37, Warning, General> - Warning: ALTER should not be used
diff --git a/TypeCobol.Analysis/Cfg/ControlFlowGraphBuilder.cs b/TypeCobol.Analysis/Cfg/ControlFlowGraphBuilder.cs
@@ -1330,7 +1330,7 @@ private void HandlePerformsWithTestAfter()
         private void CreateOptionalDiagnostics()
         {
             //BasicBlockGroupGoesBeyondTheLimit
-            if (this.Cfg.PrematurePerformExits != null)
+            if (_compilerOptions.CheckPerformPrematureExits.IsActive && this.Cfg.PrematurePerformExits != null)
             {
                 foreach (var prematurePerformExit in this.Cfg.PrematurePerformExits)
                 {
@@ -1341,28 +1341,28 @@ private void CreateOptionalDiagnostics()
                         string offendingStatement = offendingInstruction.CodeElement.SourceText;
                         int offendingLine = offendingInstruction.CodeElement.Line;
                         int offendingColumn = offendingInstruction.CodeElement.Column;
-                        Diagnostic d = new Diagnostic(MessageCode.Warning, perform.CodeElement.Position(),
+                        Diagnostic d = new Diagnostic(_compilerOptions.CheckPerformPrematureExits.GetMessageCode(), perform.CodeElement.Position(),
                             string.Format(Resource.BasicBlockGroupGoesBeyondTheLimit, offendingStatement, offendingLine, offendingColumn));
                         AddDiagnostic(d);
                     }
                 }
             }
 
             //BadPerformProcedureThru
-            if (this.Cfg.WrongOrderPerformThrus != null)
+            if (_compilerOptions.CheckPerformThruOrder.IsActive && this.Cfg.WrongOrderPerformThrus != null)
             {
                 foreach (var wrongOrderPerformThru in this.Cfg.WrongOrderPerformThrus)
                 {
                     var procedure = wrongOrderPerformThru.Value.Item1;
                     var throughProcedure = wrongOrderPerformThru.Value.Item2;
-                    Diagnostic d = new Diagnostic(MessageCode.SemanticTCErrorInParser, wrongOrderPerformThru.Key.CodeElement.Position(),
+                    Diagnostic d = new Diagnostic(_compilerOptions.CheckPerformThruOrder.GetMessageCode(), wrongOrderPerformThru.Key.CodeElement.Position(),
                         string.Format(Resource.BadPerformProcedureThru, procedure.Name, throughProcedure.Name));
                     AddDiagnostic(d);
                 }
             }
 
             //RecursiveBlockOnPerformProcedure
-            if (this.Cfg.RecursivePerforms != null)
+            if (_compilerOptions.CheckRecursivePerforms.IsActive && this.Cfg.RecursivePerforms != null)
             {
                 foreach (var recursivePerform in this.Cfg.RecursivePerforms)
                 {
@@ -1376,7 +1376,7 @@ private void CreateOptionalDiagnostics()
                             : procedureReference.ToString();
                         System.Diagnostics.Debug.Assert(offendingInstruction.CodeElement != null);
                         string offendingStatement = offendingInstruction.CodeElement.SourceText;
-                        Diagnostic d = new Diagnostic(MessageCode.SemanticTCErrorInParser, perform.CodeElement.Position(),
+                        Diagnostic d = new Diagnostic(_compilerOptions.CheckRecursivePerforms.GetMessageCode(), perform.CodeElement.Position(),
                             string.Format(Resource.RecursiveBlockOnPerformProcedure, performTarget, offendingStatement));
                         AddDiagnostic(d);
                     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`--- Diagnostics ---`
`2`		`-Line 6[12,23] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM main', recursive instruction is ' PERFORM main'.`
	`2`	`+Line 6[12,23] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM main', recursive instruction is ' PERFORM main'.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`--- Diagnostics ---`
`2`		`-Line 16[15,29] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec'.`
	`2`	`+Line 16[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec'.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`--- Diagnostics ---`
`2`		`-Line 27[15,29] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec2'.`
	`2`	`+Line 27[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec2'.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`--- Diagnostics ---`
`2`		`-Line 28[15,29] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec2'.`
	`2`	`+Line 28[15,29] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec2'.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`--- Diagnostics ---`
`2`		`-Line 16[15,64] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec varying n from 1 by 1 until n > 5'.`
	`2`	`+Line 16[15,64] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec varying n from 1 by 1 until n > 5'.`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`--- Diagnostics ---`
`2`		`-Line 16[15,72] <30, Error, Semantics> - Semantic error: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec test after varying n from 1 by 1 until n>5'.`
	`2`	`+Line 16[15,72] <37, Warning, General> - Warning: A recursive loop has been encountered while analyzing 'PERFORM pararec', recursive instruction is ' perform pararec test after varying n from 1 by 1 until n>5'.`