Merge branch 'develop' into 1816_NewExecutionStep_QualityCheck

Author: fm-117

TypeCobol.Test/Parser/Programs/Cobol85/CopyWithExecSqlAndData1.cpy

@@ -0,0 +1,4 @@
+          EXEC SQL DECLARE Table2 TABLE
+          ( Table2_Field2 CHAR(1) NOT NULL,
+          ) END-EXEC.
+          01 table2-field2 PIC X.

TypeCobol.Test/Parser/Programs/Cobol85/CopyWithExecSqlAndData2.cpy

@@ -0,0 +1,4 @@
+          EXEC SQL DECLARE Table2 TABLE
+          ( Table2_Field2 CHAR(1) NOT NULL,
+          ) END-EXEC.
+          05 table2-field2 PIC X.

TypeCobol.Test/Parser/Programs/Cobol85/CopyWithExecSqlOnly.cpy

@@ -0,0 +1,3 @@
+          EXEC SQL DECLARE Table2 TABLE
+          ( Table2_Field2 CHAR(1) NOT NULL,
+          ) END-EXEC.

TypeCobol.Test/Parser/Programs/Cobol85/ExecSqlInDataDivision.rdz.cbl

@@ -0,0 +1,22 @@
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. DVZZMFT3.
+       DATA DIVISION.
+       WORKING-STORAGE SECTION.
+      *KO empty group item
+       01 group1.
+          EXEC SQL DECLARE Table1 TABLE
+          ( Table1_Field1 CHAR(1) NOT NULL,
+          ) END-EXEC.
+      *KO same thing but with a copy
+       01 group2.
+       COPY CopyWithExecSqlOnly.
+      *KO level number mismatch
+       01 group3.
+       COPY CopyWithExecSqlAndData1.
+      *OK
+       01 group4.
+       COPY CopyWithExecSqlAndData2.
+       PROCEDURE DIVISION.
+           GOBACK
+           .
+       END PROGRAM DVZZMFT3.

TypeCobol.Test/Parser/Programs/Cobol85/ExecSqlInDataDivision.rdzMix.txt

@@ -0,0 +1,25 @@
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. DVZZMFT3.
+       DATA DIVISION.
+       WORKING-STORAGE SECTION.
+      *KO empty group item
+Line 6[11,16] <27, Error, Syntax> - Syntax error : A group item cannot be empty.
+       01 group1.
+          EXEC SQL DECLARE Table1 TABLE
+          ( Table1_Field1 CHAR(1) NOT NULL,
+          ) END-EXEC.
+      *KO same thing but with a copy
+Line 11[11,16] <27, Error, Syntax> - Syntax error : A group item cannot be empty.
+       01 group2.
+       COPY CopyWithExecSqlOnly.
+      *KO level number mismatch
+Line 14[11,16] <27, Error, Syntax> - Syntax error : Cannot include copy CopyWithExecSqlAndData1 under level 1 because copy starts at level 1.
+       01 group3.
+       COPY CopyWithExecSqlAndData1.
+      *OK
+       01 group4.
+       COPY CopyWithExecSqlAndData2.
+       PROCEDURE DIVISION.
+           GOBACK
+           .
+       END PROGRAM DVZZMFT3.

TypeCobol/Compiler/CupParser/NodeBuilder/ProgramClassBuilder.cs

@@ -873,32 +873,39 @@ public virtual void CheckStartSentenceLastStatement()
 
         public virtual void StartExecStatement(ExecStatement execStmt)
         {
-            ExitLastLevel1Definition();
             Enter(new Exec(execStmt), execStmt);
             Dispatcher.StartExecStatement(execStmt);
         }
 
         public virtual void EndExecStatement()
         {
-            //Code duplicated in OnExecStatement
             //EndExecStatement (therefore StartExecStatement) is fired if the exec is in a procedure division and is the first instruction
             //OnExecStatement is fired if the exec is in a procedure division and is not the first instruction
+            ExitExecStatement();
+            Dispatcher.EndExecStatement();
+        }
 
-            //Code to generate a specific ProcedureDeclaration as Nested when an Exec Statement is spotted. See Issue #1209
-            //This might be helpful for later
-            //if (_ProcedureDeclaration != null)
-            //{
-            //    _ProcedureDeclaration.SetFlag(Node.Flag.GenerateAsNested, true);
-            //}
-
+        private void ExitExecStatement()
+        {
             //Code to generate all ProcedureDeclarations as Nested when an Exec Statement is spotted. See Issue #1209
             //This is the selected solution until we determine the more optimal way to generate a program that contains Exec Statements
             if (_ProcedureDeclaration != null)
             {
                 CurrentNode.Root.MainProgram.SetFlag(Node.Flag.GenerateAsNested, true);
             }
+
+            var exec = CurrentNode;
             Exit();
-            Dispatcher.EndExecStatement();
+
+            //EXECs inside a DataDefinition are moved to the parent data division section
+            //Children of a DataDefinition are thus guaranteed to be DataDefinition themselves
+            var targetParent = CurrentNode;
+            while (targetParent is DataDefinition)
+            {
+                targetParent = targetParent.Parent;
+            }
+            exec.Parent.Remove(exec);
+            targetParent.Add(exec);
         }
 
         public virtual void OnContinueStatement(ContinueStatement stmt)
@@ -1080,25 +1087,9 @@ public virtual void OnProcedureStyleCall(ProcedureStyleCallStatement stmt, CallS
         public virtual void OnExecStatement(ExecStatement stmt)
         {
             Enter(new Exec(stmt), stmt);
-
-            //Code duplicated in OnExecStatement
             //EndExecStatement (therefore StartExecStatement) is fired if the exec is in a procedure division and is the first instruction
             //OnExecStatement is fired if the exec is in a procedure division and is not the first instruction
-
-            //Code to generate a specific ProcedureDeclaration as Nested when an Exec Statement is spotted. See Issue #1209
-            //This might be helpful for later
-            //if (_ProcedureDeclaration != null)
-            //{
-            //    _ProcedureDeclaration.SetFlag(Node.Flag.GenerateAsNested, true);
-            //}
-
-            //Code to generate all ProcedureDeclarations as Nested when an Exec Statement is spotted. See Issue #1209
-            //This is the selected solution until we determine the more optimal way to generate a program that contains Exec Statements
-            if (_ProcedureDeclaration != null)
-            {
-                CurrentNode.Root.MainProgram.SetFlag(Node.Flag.GenerateAsNested, true);
-            }
-            Exit();
+            ExitExecStatement();
             Dispatcher.OnExecStatement(stmt);
         }
 

TypeCobol/Compiler/Diagnostics/CrossChecker.cs

@@ -489,18 +489,17 @@ public override bool Visit(DataDescription dataDescription)
                 var nodeIndex = dataDescription.Parent.IndexOf(dataDescription);
                 //Get sibling nodes
                 var siblingNodes = dataDescription.Parent.Children;
-                //Check if next node is inside a copy when this isn't the last node
-                if (siblingNodes.Count > nodeIndex + 1 && siblingNodes[nodeIndex + 1].IsInsideCopy())
+                //Get immediately following DataDefinition
+                var nextData = siblingNodes.Skip(nodeIndex + 1).OfType<DataDefinition>().FirstOrDefault();
+                if (nextData != null && nextData.IsInsideCopy())
                 {
-                    //Get next sibling node
-                    var nextSibling = siblingNodes[nodeIndex + 1];
-                    DiagnosticUtils.AddError(dataDescription, $"Cannot include copy {nextSibling.CodeElement?.FirstCopyDirective.TextName} " +
+                    DiagnosticUtils.AddError(dataDescription, $"Cannot include copy {nextData.CodeElement.FirstCopyDirective.TextName} " +
                                                               $"under level {dataDescriptionEntry.LevelNumber} " +
-                                                              $"because copy starts at level {((DataDescription)nextSibling).CodeElement.LevelNumber}.", dataDescriptionEntry);
+                                                              $"because copy starts at level {nextData.CodeElement.LevelNumber}.", dataDescriptionEntry);
                 }
-                //Last node so this is an empty group item
                 else
                 {
+                    //Last node so this is an empty group item
                     DiagnosticUtils.AddError(dataDescription, "A group item cannot be empty.", dataDescriptionEntry);
                 }
             }