From 8968578d50858721317d410549a9f9b5c62bf1f7 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 24 Jun 2020 12:24:20 -0700
Subject: Integrate Symbol to TupleWithSection rename

---
 .../Link/FindEntrySectionAndLoadSymbolsCommand.cs    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs')

diff --git a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
index b9890a3b..31cbf0b8 100644
--- a/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
+++ b/src/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
@@ -31,17 +31,17 @@ namespace WixToolset.Core.Link
         /// <summary>
         /// Gets the collection of loaded symbols.
         /// </summary>
-        public IDictionary<string, Symbol> Symbols { get; private set; }
+        public IDictionary<string, TupleWithSection> TuplesByName { get; private set; }
 
         /// <summary>
         /// Gets the collection of possibly conflicting symbols.
         /// </summary>
-        public IEnumerable<Symbol> PossiblyConflictingSymbols { get; private set; }
+        public IEnumerable<TupleWithSection> PossibleConflicts { get; private set; }
 
         public void Execute()
         {
-            var symbols = new Dictionary<string, Symbol>();
-            var possibleConflicts = new HashSet<Symbol>();
+            var tuplesByName = new Dictionary<string, TupleWithSection>();
+            var possibleConflicts = new HashSet<TupleWithSection>();
 
             if (!Enum.TryParse(this.ExpectedOutputType.ToString(), out SectionType expectedEntrySectionType))
             {
@@ -74,11 +74,11 @@ namespace WixToolset.Core.Link
                 // Load all the symbols from the section's tables that create symbols.
                 foreach (var tuple in section.Tuples.Where(t => t.Id != null))
                 {
-                    var symbol = new Symbol(section, tuple);
+                    var symbol = new TupleWithSection(section, tuple);
 
-                    if (!symbols.TryGetValue(symbol.Name, out var existingSymbol))
+                    if (!tuplesByName.TryGetValue(symbol.Name, out var existingSymbol))
                     {
-                        symbols.Add(symbol.Name, symbol);
+                        tuplesByName.Add(symbol.Name, symbol);
                     }
                     else // uh-oh, duplicate symbols.
                     {
@@ -86,7 +86,7 @@ namespace WixToolset.Core.Link
                         // point to identical tuples. Identical directory tuples are redundant and will not cause
                         // conflicts.
                         if (AccessModifier.Private == existingSymbol.Access && AccessModifier.Private == symbol.Access &&
-                            TupleDefinitionType.Directory == existingSymbol.Row.Definition.Type && existingSymbol.Row.IsIdentical(symbol.Row))
+                            TupleDefinitionType.Directory == existingSymbol.Tuple.Definition.Type && existingSymbol.Tuple.IsIdentical(symbol.Tuple))
                         {
                             // Ensure identical symbol's tuple is marked redundant to ensure (should the tuple be
                             // referenced into the final output) it will not add duplicate primary keys during
@@ -103,8 +103,8 @@ namespace WixToolset.Core.Link
                 }
             }
 
-            this.Symbols = symbols;
-            this.PossiblyConflictingSymbols = possibleConflicts;
+            this.TuplesByName = tuplesByName;
+            this.PossibleConflicts = possibleConflicts;
         }
     }
 }
-- 
cgit v1.2.3-55-g6feb