Merge branch 'develop' into 1816_NewExecutionStep_QualityCheck

Author: fm-117

TypeCobol.Test/Parser/Programs/Cobol85/DataRenames.rdz-Nodes.txt

@@ -0,0 +1,24 @@
+--- Nodes ---
+?
+  PGM1
+    data-division
+      working-storage
+        TEST-GROUP1
+          TEST-SGROUP1
+            TEST-ELT1
+            TEST-ELT2
+          TEST-SGROUP2
+            TEST-ELT3
+            TEST-ELT4
+          TEST-SGROUP5
+            TEST-ELT5
+          TEST-RENAMES
+        TEST-GROUP2
+          TEST-SGROUP6
+            ELT1
+            ELT2
+          TEST-SGROUP7
+            ELT3
+            ELT4
+          TEST-RENAMES-GROUP
+    end

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

@@ -0,0 +1,24 @@
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. PGM1.
+       DATA DIVISION.
+       WORKING-STORAGE SECTION.
+       01 TEST-GROUP1.
+          05 TEST-SGROUP1.
+             10 TEST-ELT1 PIC X(04).
+             10 TEST-ELT2 PIC X(350).
+          05 TEST-SGROUP2.
+             10 TEST-ELT3 PIC X(200).
+             10 TEST-ELT4 PIC X(1000).
+          05 TEST-SGROUP5.
+             10 TEST-ELT5 PIC X(100).
+          66 TEST-RENAMES RENAMES TEST-ELT2
+                          THRU    TEST-ELT4.
+       01 TEST-GROUP2.
+          05 TEST-SGROUP6.
+             10 ELT1 PIC X.
+             10 ELT2 PIC X.
+          05 TEST-SGROUP7.
+             10 ELT3 PIC X.
+             10 ELT4 PIC X.
+          66 TEST-RENAMES-GROUP RENAMES TEST-SGROUP6.
+       END PROGRAM PGM1.

TypeCobol/Compiler/CupParser/NodeBuilder/ProgramClassBuilder.cs

@@ -148,60 +148,44 @@ private void AttachEndIfExists(CodeElementEnd end)
             }
         }
 
-        private Node GetTopLevelItem(long level)
-        {
-            var parent = CurrentNode;
-            while (parent != null)
-            {
-                var data = parent.CodeElement as DataDefinitionEntry;
-                if (data == null) return null;
-                if (data.LevelNumber == null || data.LevelNumber.Value < level) return parent;
-                parent = parent.Parent;
-            }
-            return null;
-        }
-
         /// <summary>Exit() every Node that is not the top-level item for a data of a given level.</summary>
         /// <param name="levelnumber">
         /// Level number of the next data definition that will be Enter()ed.
         /// If null, a value of 1 is assumed.
         /// </param>
         private void SetCurrentNodeToTopLevelItem(IntegerValue levelnumber)
         {
-            long level = levelnumber != null ? levelnumber.Value : 1;
-            Node parent;
-
+            long level = levelnumber?.Value ?? 1;
             if (level == 1 || level == 77)
             {
-                parent = null;
-            }
-            else
-            {
-                parent = GetTopLevelItem(level);
-            }
-            if (parent != null)
-            {
-                // Exit() previous sibling and all of its last children
-                while (parent != CurrentNode) Exit();
+                //level-1 and level-77 should be attached directly into the section.
+                ExitLastLevel1Definition();
             }
             else
             {
-                ExitLastLevel1Definition();
+                long parentLevel = level == 66 ? 1 : level - 1; //level-66 should be attached to their corresponding level-1.
+                while (CurrentNode.CodeElement is DataDefinitionEntry entry)
+                {
+                    //Exit() till we reach or get over expected parent level.
+                    if (entry.LevelNumber == null) break;
+                    if (entry.LevelNumber.Value <= parentLevel) break;
+                    Exit();
+                }
             }
         }
 
         /// <summary>Exit last level-01 data definition entry, as long as all its subordinates.</summary>
         private void ExitLastLevel1Definition()
         {
             _CurrentTypeDefinition = null;
-            Node LastLevel1Def = null;
-            while (CurrentNode.CodeElement != null && CurrentNode.CodeElement is DataDefinitionEntry)
+            Node lastLevel1Definition = null;
+            while (CurrentNode.CodeElement is DataDefinitionEntry)
             {
-                LastLevel1Def = CurrentNode;
+                lastLevel1Definition = CurrentNode;
                 Exit();
             }
-            if (LastLevel1Def != null)
-                Dispatcher.OnLevel1Definition((DataDefinition)LastLevel1Def);
+            if (lastLevel1Definition != null)
+                Dispatcher.OnLevel1Definition((DataDefinition) lastLevel1Definition);//Call is made also for level-77.
         }
 
         public virtual void StartCobolCompilationUnit()