Integrate the IntermediateSection and IntermediateSymbol mutable changes

4 files changed, 40 insertions, 44 deletions

diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs
index d737b359..0bc63d79 100644
--- a/src/WixToolset.Core/CompilerCore.cs
+++ b/src/WixToolset.Core/CompilerCore.cs
@@ -1059,8 +1059,7 @@ namespace WixToolset.Core
         /// <returns>New section.</returns>
         internal IntermediateSection CreateSection(string id, SectionType type, int codepage, string compilationId)
         {
-            var section = new IntermediateSection(id, type, codepage);
-            section.CompilationId = compilationId;
+            var section = new IntermediateSection(id, type, codepage, compilationId);
 
             this.intermediate.Sections.Add(section);
 
diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs
index 059a478b..1dd1b44d 100644
--- a/src/WixToolset.Core/Librarian.cs
+++ b/src/WixToolset.Core/Librarian.cs
@@ -60,7 +60,7 @@ namespace WixToolset.Core
 
                 foreach (var section in sections)
                 {
-                    section.LibraryId = context.LibraryId;
+                    section.AssignToLibrary(context.LibraryId);
                 }
 
                 library = new Intermediate(context.LibraryId, IntermediateLevels.Compiled, sections, localizationsByCulture);
diff --git a/src/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
index a8044a0c..99220900 100644
--- a/src/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -23,7 +23,7 @@ namespace WixToolset.Core.Link
         private List<string> groupTypes;
         private List<string> itemTypes;
         private ItemCollection items;
-        private readonly List<int> rowsUsed;
+        private readonly List<IntermediateSymbol> symbolsUsed;
         private bool loaded;
 
         /// <summary>
@@ -36,7 +36,7 @@ namespace WixToolset.Core.Link
             this.EntrySection = entrySections;
             this.Messaging = messageHandler;
 
-            this.rowsUsed = new List<int>();
+            this.symbolsUsed = new List<IntermediateSymbol>();
             this.loaded = false;
         }
 
@@ -144,16 +144,9 @@ namespace WixToolset.Core.Link
         /// </summary>
         public void RemoveUsedGroupRows()
         {
-            var sortedIndexes = this.rowsUsed.Distinct().OrderByDescending(i => i).ToList();
-
-            //Table wixGroupTable = this.output.Tables["WixGroup"];
-            //Debug.Assert(null != wixGroupTable);
-            //Debug.Assert(sortedIndexes[0] < wixGroupTable.Rows.Count);
-
-            foreach (int rowIndex in sortedIndexes)
+            foreach (var symbol in this.symbolsUsed)
             {
-                //wixGroupTable.Rows.RemoveAt(rowIndex);
-                this.EntrySection.Symbols.RemoveAt(rowIndex);
+                this.EntrySection.RemoveSymbol(symbol);
             }
         }
 
@@ -236,39 +229,36 @@ namespace WixToolset.Core.Link
             //}
 
             // Collect all of the groups
-            for (int rowIndex = 0; rowIndex < this.EntrySection.Symbols.Count; ++rowIndex)
+            foreach (var symbol in this.EntrySection.Symbols.OfType<WixGroupSymbol>())
             {
-                if (this.EntrySection.Symbols[rowIndex] is WixGroupSymbol row)
+                var rowParentName = symbol.ParentId;
+                var rowParentType = symbol.ParentType.ToString();
+                var rowChildName = symbol.ChildId;
+                var rowChildType = symbol.ChildType.ToString();
+
+                // If this row specifies a parent or child type that's not in our
+                // lists, we assume it's not a row that we're concerned about.
+                if (!this.groupTypes.Contains(rowParentType) ||
+                    !this.itemTypes.Contains(rowChildType))
                 {
-                    var rowParentName = row.ParentId;
-                    var rowParentType = row.ParentType.ToString();
-                    var rowChildName = row.ChildId;
-                    var rowChildType = row.ChildType.ToString();
-
-                    // If this row specifies a parent or child type that's not in our
-                    // lists, we assume it's not a row that we're concerned about.
-                    if (!this.groupTypes.Contains(rowParentType) ||
-                        !this.itemTypes.Contains(rowChildType))
-                    {
-                        continue;
-                    }
+                    continue;
+                }
 
-                    this.rowsUsed.Add(rowIndex);
+                this.symbolsUsed.Add(symbol);
 
-                    if (!this.items.TryGetValue(rowParentType, rowParentName, out var parentItem))
-                    {
-                        parentItem = new Item(row, rowParentType, rowParentName);
-                        this.items.Add(parentItem);
-                    }
-
-                    if (!this.items.TryGetValue(rowChildType, rowChildName, out var childItem))
-                    {
-                        childItem = new Item(row, rowChildType, rowChildName);
-                        this.items.Add(childItem);
-                    }
+                if (!this.items.TryGetValue(rowParentType, rowParentName, out var parentItem))
+                {
+                    parentItem = new Item(symbol, rowParentType, rowParentName);
+                    this.items.Add(parentItem);
+                }
 
-                    parentItem.ChildItems.Add(childItem);
+                if (!this.items.TryGetValue(rowChildType, rowChildName, out var childItem))
+                {
+                    childItem = new Item(symbol, rowChildType, rowChildName);
+                    this.items.Add(childItem);
                 }
+
+                parentItem.ChildItems.Add(childItem);
             }
         }
 
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index a6d43715..320f7d1f 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -585,13 +585,15 @@ namespace WixToolset.Core
             // now and after processing added back in Step 3 below.
             foreach (var section in sections)
             {
+                var removeSymbols = new List<IntermediateSymbol>();
+
                 // Count down because we'll sometimes remove items from the list.
-                for (var i = section.Symbols.Count - 1; i >= 0; --i)
+                foreach (var symbol in section.Symbols)
                 {
                     // Only process the "grouping parents" such as FeatureGroup, ComponentGroup, Feature,
                     // and Module. Non-grouping complex references are simple and
                     // resolved during normal complex reference resolutions.
-                    if (section.Symbols[i] is WixComplexReferenceSymbol wixComplexReferenceRow &&
+                    if (symbol is WixComplexReferenceSymbol wixComplexReferenceRow &&
                         (ComplexReferenceParentType.FeatureGroup == wixComplexReferenceRow.ParentType ||
                          ComplexReferenceParentType.ComponentGroup == wixComplexReferenceRow.ParentType ||
                          ComplexReferenceParentType.Feature == wixComplexReferenceRow.ParentType ||
@@ -611,7 +613,7 @@ namespace WixToolset.Core
                         }
 
                         childrenComplexRefs.Add(wixComplexReferenceRow);
-                        section.Symbols.RemoveAt(i);
+                        removeSymbols.Add(wixComplexReferenceRow);
 
                         // Remember the mapping from set of complex references with a common
                         // parent to their section. We'll need this to add them back to the
@@ -635,6 +637,11 @@ namespace WixToolset.Core
                         }
                     }
                 }
+
+                foreach (var removeSymbol in removeSymbols)
+                {
+                    section.RemoveSymbol(removeSymbol);
+                }
             }
 
             Debug.Assert(parentGroups.Count == parentGroupsSections.Count);