Skip to content

2007 optional diag cfg #2008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 27, 2021
Merged

2007 optional diag cfg #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da7c514
WI #2007 Defer CFG diagnostics creation
fm-117 Jul 20, 2021
4fc0a3a
WI #2007 Add optional CFG diagnostics options
fm-117 Jul 20, 2021
754ee71
WI #2007 Set CFG checks severity according to their selected level
fm-117 Jul 20, 2021
791f172
WI #2007 Restore private visibility for SetupPredecessorEdgesFromStar…
fm-117 Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CLI/src/CLI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,15 @@ private Dictionary<string, IReport> RegisterAnalyzers(AnalyzerProvider analyzerP
if (_configuration.ExecToStep >= ExecutionStep.CrossCheck)
{
//All purpose CFG/DFA
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(_configuration.CfgBuildingMode));
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(_configuration.CfgBuildingMode, o));

//CFG/DFA for ZCALL report
if (!string.IsNullOrEmpty(_configuration.ReportZCallFilePath))
{
if (_configuration.CfgBuildingMode != CfgBuildingMode.WithDfa)
{
//Need to create a dedicated CFG builder with DFA activated
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(CfgBuildingMode.WithDfa));
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(CfgBuildingMode.WithDfa, o));
}

string zCallCfgDfaId = CfgDfaAnalyzerFactory.GetIdForMode(CfgBuildingMode.WithDfa);
Expand Down
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformIdentity.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc1Recursive0.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc2Recursive0.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc3Recursive0.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
6 changes: 3 additions & 3 deletions TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProc4Recursive0.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive0.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive1.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeAfterRecursive2.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/BasicCfgInstrs/PerformProcIterativeRecursive0.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
6 changes: 3 additions & 3 deletions TypeCobol.Analysis.Test/BasicCfgInstrs/PerformThru2.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'.
8 changes: 4 additions & 4 deletions TypeCobol.Analysis.Test/BasicCfgInstrs/SG102A.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/CfgTestUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static CfgTestUtils()
void AddAnalyzerProvider(CfgBuildingMode mode)
{
var analyzerProvider = new AnalyzerProvider();
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(mode));
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(mode, o));
_AnalyzerProviders.Add(mode, analyzerProvider);
}
}
Expand Down
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/PerformanceWithCfg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected override IAnalyzerProvider CreateAnalyzerProvider()
//Add analyzers
var analyzerProvider = new AnalyzerProvider();
//CFG/DFA
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(CfgBuildingMode.Standard));
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(CfgBuildingMode.Standard, o));
return analyzerProvider;
}

Expand Down
2 changes: 1 addition & 1 deletion TypeCobol.Analysis.Test/PerformanceWithCfgDfa.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ protected override IAnalyzerProvider CreateAnalyzerProvider()
//Add analyzers
var analyzerProvider = new AnalyzerProvider();
//CFG/DFA
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(CfgBuildingMode.WithDfa));
analyzerProvider.AddActivator((o, t) => CfgDfaAnalyzerFactory.CreateCfgAnalyzer(CfgBuildingMode.WithDfa, o));
return analyzerProvider;
}

Expand Down
Loading