Merge branch 'develop' into 1975_LSP_Add_missingCopiesparams_CPY_Copies

Author: fm-117

CLI/src/CLI.cs

@@ -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);

Codegen/src/Nodes/ProcedureDivision.cs

@@ -114,7 +114,7 @@ public GeneratedParameter(SymbolDefinition symbol) {
 
 	public static StorageArea CreateReceivingStorageArea(SymbolDefinition symbol) {
 		if (symbol == null) return null;
-		var storage = new DataOrConditionStorageArea(new SymbolReference(symbol));
+		var storage = new DataOrConditionStorageArea(new SymbolReference(symbol), false);
 		return storage;
 	}
 }

Codegen/test/resources/input/TypeCobol/ProcedureSubscript.rdz.tcbl

@@ -5,7 +5,7 @@
        WORKING-STORAGE SECTION.
        01 MyPicVar PIC X(10).
        01 MyGroup.
-          05 MyValue  PIC 2.
+          05 MyValue  PIC 9(2).
        01  StringArray.
            05 OCCURS 10 INDEXED BY StringIdx.
               10  Pnt               POINTER.

Codegen/test/resources/output/TypeCobol/ProcedureSubscript.rdz.tcbl

@@ -6,7 +6,7 @@
        WORKING-STORAGE SECTION.
        01 MyPicVar PIC X(10).
        01 MyGroup.
-          05 MyValue  PIC 2.
+          05 MyValue  PIC 9(2).
        01  StringArray.
            05 OCCURS 10 INDEXED BY StringIdx.
               10  Pnt               POINTER.

TypeCobol.Analysis.Test/BasicCfgInstrs/CGM110.diag

@@ -10,8 +10,10 @@ Line 28256[8,37] <37, Warning, General> - Warning: Paragraph 'CGBCALAK-SYSPUNCH-
 Line 28289[8,37] <37, Warning, General> - Warning: Paragraph 'CGBCALAK-SYSPUNCH-WSBA-SUITE' is empty
 Line 28327[8,32] <37, Warning, General> - Warning: Paragraph 'CGBCALAK-SYSPUNCH-SUITE' is empty
 Line 29421[13,18] <37, Warning, General> - Warning: a End statement is not aligned with the matching opening statement
+Line 29550[20,71] <37, Warning, General> - Warning: Moving alphanumeric 'WS-CMM010-CODE-CADRAGE-JJ' to numeric 'WS-CMM010-CADR-BIN' declared with an USAGE may lead to unexpected results.
 Line 29627[16,21] <37, Warning, General> - Warning: a End statement is not aligned with the matching opening statement
 Line 29628[16,21] <37, Warning, General> - Warning: a End statement is not aligned with the matching opening statement
+Line 29685[24,46] <37, Warning, General> - Warning: Moving alphanumeric 'WS-CMM010-CODE-CADRAGE-JJ' to numeric 'WS-CMM010-CADR-BIN' declared with an USAGE may lead to unexpected results.
 Line 29772[12,17] <37, Warning, General> - Warning: "end-if" is missing
 Line 29776[16,21] <37, Warning, General> - Warning: "end-if" is missing
 Line 31035[21,26] <37, Warning, General> - Warning: a End statement is not aligned with the matching opening statement

TypeCobol.Analysis.Test/BasicCfgInstrs/CfgInNestedPrg2.cbl

@@ -19,9 +19,9 @@
           02 zres pic s9(12)v999.
        WORKING-STORAGE SECTION.
        01 tabind.
-          02 ind pic 1 occurs 99.
-       77 ef pic 1 value "1".
-       77 fct3 pic 1 value "1".
+          02 ind pic X occurs 99.
+       77 ef pic X value "1".
+       77 fct3 pic X value "1".
        PROCEDURE DIVISION.
            open i-o VUE.
            move zero to fct1 fct2 zres.

TypeCobol.Analysis.Test/BasicCfgInstrs/CfgInStackedPrg1.cbl

@@ -45,9 +45,9 @@
           02 zres pic s9(12)v999.
        WORKING-STORAGE SECTION.
        01 tabind.
-          02 ind pic 1 occurs 99.
-       77 ef pic 1 value "1".
-       77 fct3 pic 1 value "1".
+          02 ind pic X occurs 99.
+       77 ef pic X value "1".
+       77 fct3 pic X value "1".
        PROCEDURE DIVISION.
            open i-o VUE.
            move zero to fct1 fct2 zres.

TypeCobol.Analysis.Test/BasicCfgInstrs/Declaratives1.cbl

@@ -33,15 +33,15 @@
       
        EMPL-FOOT-USE SECTION. USE FOR DEBUGGING ON ALL PROCEDURES.
        EMPL-FOOT-PROC.
-       MOVE NUM TO NBJ.
-       MOVE NBJ TO NUM.
+       MOVE NUM(1) TO NBJ(1).
+       MOVE NBJ(2) TO NUM(2).
        EMPL-FOOT-EXIT.
        EXIT.
       
        DEPT-FOOT-USE SECTION. USE FOR DEBUGGING ON ALL PROCEDURES.
        DEPT-FOOT-PROC.
-       MOVE NUM TO NBJ.
-       MOVE NBJ TO NUM.
+       MOVE NUM(3) TO NBJ(3).
+       MOVE NBJ(4) TO NUM(4).
       * SUPPRESS PRINTING.
       
        DEPT-FOOT-EXIT.
@@ -55,8 +55,8 @@
        GO TO COMP-FOOT-EXIT.
       
        COMP-FOOT-CALC.
-       MOVE NUM TO NBJ.
-       MOVE NBJ TO NUM.
+       MOVE NUM(5) TO NBJ(5).
+       MOVE NBJ(6) TO NUM(6).
       
        COMP-FOOT-EXIT.
        EXIT.

TypeCobol.Analysis.Test/BasicCfgInstrs/Declaratives1.dot

@@ -38,10 +38,10 @@ Block9 [
 label = "{EMPL-FOOT-USE. Block9|                       USE FOR DEBUGGING ON ALL PROCEDURES.\l}"
 ]
 Block10 [
-label = "{EMPL-FOOT-PROC. Block10|MOVE NUM TO NBJ\l}"
+label = "{EMPL-FOOT-PROC. Block10|MOVE NUM(1) TO NBJ(1)\l}"
 ]
 Block11 [
-label = "{EMPL-FOOT-PROC. Block11|MOVE NBJ TO NUM\l}"
+label = "{EMPL-FOOT-PROC. Block11|MOVE NBJ(2) TO NUM(2)\l}"
 ]
 Block12 [
 label = "{EMPL-FOOT-EXIT. Block12|EXIT\l}"
@@ -50,10 +50,10 @@ Block13 [
 label = "{DEPT-FOOT-USE. Block13|                       USE FOR DEBUGGING ON ALL PROCEDURES.\l}"
 ]
 Block14 [
-label = "{DEPT-FOOT-PROC. Block14|MOVE NUM TO NBJ\l}"
+label = "{DEPT-FOOT-PROC. Block14|MOVE NUM(3) TO NBJ(3)\l}"
 ]
 Block15 [
-label = "{DEPT-FOOT-PROC. Block15|MOVE NBJ TO NUM\l}"
+label = "{DEPT-FOOT-PROC. Block15|MOVE NBJ(4) TO NUM(4)\l}"
 ]
 Block16 [
 label = "{DEPT-FOOT-EXIT. Block16|EXIT\l}"
@@ -71,10 +71,10 @@ subgraph cluster_1{
 color = blue;
 label = "COMP-FOOT-CALC";
 Block27 [
-label = "{COMP-FOOT-CALC. Block27|MOVE NUM TO NBJ\l}"
+label = "{COMP-FOOT-CALC. Block27|MOVE NUM(5) TO NBJ(5)\l}"
 ]
 Block28 [
-label = "{COMP-FOOT-CALC. Block28|MOVE NBJ TO NUM\l}"
+label = "{COMP-FOOT-CALC. Block28|MOVE NBJ(6) TO NUM(6)\l}"
 ]
 
 }

TypeCobol.Analysis.Test/BasicCfgInstrs/IfThen0.cbl

@@ -3,7 +3,7 @@
       
        DATA DIVISION.
        WORKING-STORAGE SECTION.
-       01 A PIC P(2) VALUE 10.
+       01 A PIC 9(2) VALUE 10.
        PROCEDURE DIVISION.
            IF A = 10 THEN
              DISPLAY "A = 10"