The Great Tuple to Symbol Rename (tm)

7 files changed, 55 insertions, 55 deletions

diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs
index 0005b1d5..5b8d4b3f 100644
--- a/src/test/Example.Extension/ExampleCompilerExtension.cs
+++ b/src/test/Example.Extension/ExampleCompilerExtension.cs
@@ -92,8 +92,8 @@ namespace Example.Extension
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example", id);
-                tuple.Set(0, value);
+                var symbol = this.ParseHelper.CreateSymbol(section, sourceLineNumbers, "Example", id);
+                symbol.Set(0, value);
             }
         }
 
@@ -152,12 +152,12 @@ namespace Example.Extension
 
             if (!this.Messaging.EncounteredError)
             {
-                this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, this.BundleExtensionId);
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, this.BundleExtensionId);
             }
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new ExampleSearchTuple(sourceLineNumbers, id)
+                var symbol = section.AddSymbol(new ExampleSearchSymbol(sourceLineNumbers, id)
                 {
                     SearchFor = searchFor,
                 });
@@ -176,7 +176,7 @@ namespace Example.Extension
                     {
                         case "Id":
                             var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleTupleDefinitions.ExampleSearch, refId);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleSymbolDefinitions.ExampleSearch, refId);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
diff --git a/src/test/Example.Extension/ExampleExtensionData.cs b/src/test/Example.Extension/ExampleExtensionData.cs
index 2ba94397..91d60eb9 100644
--- a/src/test/Example.Extension/ExampleExtensionData.cs
+++ b/src/test/Example.Extension/ExampleExtensionData.cs
@@ -9,15 +9,15 @@ namespace Example.Extension
     {
         public string DefaultCulture => null;
 
-        public Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        public Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
-            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", tupleDefinitions);
+            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", symbolDefinitions);
         }
 
-        public bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
+        public bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
-            tupleDefinition = ExampleTupleDefinitions.ByName(name);
-            return tupleDefinition != null;
+            symbolDefinition = ExampleSymbolDefinitions.ByName(name);
+            return symbolDefinition != null;
         }
     }
 }
\ No newline at end of file
diff --git a/src/test/Example.Extension/ExampleSearchTuple.cs b/src/test/Example.Extension/ExampleSearchTuple.cs
index 353ef158..40a39292 100644
--- a/src/test/Example.Extension/ExampleSearchTuple.cs
+++ b/src/test/Example.Extension/ExampleSearchTuple.cs
@@ -4,27 +4,27 @@ namespace Example.Extension
 {
     using WixToolset.Data;
 
-    public enum ExampleSearchTupleFields
+    public enum ExampleSearchSymbolFields
     {
         SearchFor,
     }
 
-    public class ExampleSearchTuple : IntermediateTuple
+    public class ExampleSearchSymbol : IntermediateSymbol
     {
-        public ExampleSearchTuple() : base(ExampleTupleDefinitions.ExampleSearch, null, null)
+        public ExampleSearchSymbol() : base(ExampleSymbolDefinitions.ExampleSearch, null, null)
         {
         }
 
-        public ExampleSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.ExampleSearch, sourceLineNumber, id)
+        public ExampleSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.ExampleSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ExampleTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index];
 
         public string SearchFor
         {
-            get => this.Fields[(int)ExampleSearchTupleFields.SearchFor]?.AsString();
-            set => this.Set((int)ExampleSearchTupleFields.SearchFor, value);
+            get => this.Fields[(int)ExampleSearchSymbolFields.SearchFor]?.AsString();
+            set => this.Set((int)ExampleSearchSymbolFields.SearchFor, value);
         }
     }
 }
diff --git a/src/test/Example.Extension/ExampleTableDefinitions.cs b/src/test/Example.Extension/ExampleTableDefinitions.cs
index 4901cc09..a2b81698 100644
--- a/src/test/Example.Extension/ExampleTableDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTableDefinitions.cs
@@ -8,14 +8,14 @@ namespace Example.Extension
     {
         public static readonly TableDefinition ExampleTable = new TableDefinition(
             "Wix4Example",
-            ExampleTupleDefinitions.Example,
+            ExampleSymbolDefinitions.Example,
             new[]
             {
                 new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
                 new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
             },
             strongRowType: typeof(ExampleRow),
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition NotInAll = new TableDefinition(
@@ -26,7 +26,7 @@ namespace Example.Extension
                 new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
                 new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition[] All = new[] { ExampleTable };
diff --git a/src/test/Example.Extension/ExampleTuple.cs b/src/test/Example.Extension/ExampleTuple.cs
index f2bcb925..314087e9 100644
--- a/src/test/Example.Extension/ExampleTuple.cs
+++ b/src/test/Example.Extension/ExampleTuple.cs
@@ -4,27 +4,27 @@ namespace Example.Extension
 {
     using WixToolset.Data;
 
-    public enum ExampleTupleFields
+    public enum ExampleSymbolFields
     {
         Value,
     }
 
-    public class ExampleTuple : IntermediateTuple
+    public class ExampleSymbol : IntermediateSymbol
     {
-        public ExampleTuple() : base(ExampleTupleDefinitions.Example, null, null)
+        public ExampleSymbol() : base(ExampleSymbolDefinitions.Example, null, null)
         {
         }
 
-        public ExampleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.Example, sourceLineNumber, id)
+        public ExampleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.Example, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ExampleTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index];
 
         public string Value
         {
-            get => this.Fields[(int)ExampleTupleFields.Value]?.AsString();
-            set => this.Set((int)ExampleTupleFields.Value, value);
+            get => this.Fields[(int)ExampleSymbolFields.Value]?.AsString();
+            set => this.Set((int)ExampleSymbolFields.Value, value);
         }
     }
 }
diff --git a/src/test/Example.Extension/ExampleTupleDefinitions.cs b/src/test/Example.Extension/ExampleTupleDefinitions.cs
index 446c2c45..f13d716d 100644
--- a/src/test/Example.Extension/ExampleTupleDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTupleDefinitions.cs
@@ -6,58 +6,58 @@ namespace Example.Extension
     using WixToolset.Data;
     using WixToolset.Data.Burn;
 
-    public enum ExampleTupleDefinitionType
+    public enum ExampleSymbolDefinitionType
     {
         Example,
         ExampleSearch,
     }
 
-    public static class ExampleTupleDefinitions
+    public static class ExampleSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition Example = new IntermediateTupleDefinition(
-            ExampleTupleDefinitionType.Example.ToString(),
+        public static readonly IntermediateSymbolDefinition Example = new IntermediateSymbolDefinition(
+            ExampleSymbolDefinitionType.Example.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ExampleTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExampleSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(ExampleTuple));
+            typeof(ExampleSymbol));
 
-        public static readonly IntermediateTupleDefinition ExampleSearch = new IntermediateTupleDefinition(
-            ExampleTupleDefinitionType.ExampleSearch.ToString(),
+        public static readonly IntermediateSymbolDefinition ExampleSearch = new IntermediateSymbolDefinition(
+            ExampleSymbolDefinitionType.ExampleSearch.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ExampleSearchTupleFields.SearchFor), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExampleSearchSymbolFields.SearchFor), IntermediateFieldType.String),
             },
-            typeof(ExampleSearchTuple));
+            typeof(ExampleSearchSymbol));
 
-        static ExampleTupleDefinitions()
+        static ExampleSymbolDefinitions()
         {
-            ExampleSearch.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag);
+            ExampleSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
         }
 
-        public static bool TryGetTupleType(string name, out ExampleTupleDefinitionType type)
+        public static bool TryGetSymbolType(string name, out ExampleSymbolDefinitionType type)
         {
             return Enum.TryParse(name, out type);
         }
 
-        public static IntermediateTupleDefinition ByName(string name)
+        public static IntermediateSymbolDefinition ByName(string name)
         {
-            if (!TryGetTupleType(name, out var type))
+            if (!TryGetSymbolType(name, out var type))
             {
                 return null;
             }
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(ExampleTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(ExampleSymbolDefinitionType type)
         {
             switch (type)
             {
-                case ExampleTupleDefinitionType.Example:
-                    return ExampleTupleDefinitions.Example;
+                case ExampleSymbolDefinitionType.Example:
+                    return ExampleSymbolDefinitions.Example;
 
-                case ExampleTupleDefinitionType.ExampleSearch:
-                    return ExampleTupleDefinitions.ExampleSearch;
+                case ExampleSymbolDefinitionType.ExampleSearch:
+                    return ExampleSymbolDefinitions.ExampleSearch;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
diff --git a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
index 4ce4635f..2c108d96 100644
--- a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
+++ b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
@@ -11,23 +11,23 @@ namespace Example.Extension
     {
         public override IEnumerable<TableDefinition> TableDefinitions => ExampleTableDefinitions.All;
 
-        public override bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
+        public override bool TryAddSymbolToOutput(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
         {
-            if (ExampleTupleDefinitions.TryGetTupleType(tuple.Definition.Name, out var tupleType))
+            if (ExampleSymbolDefinitions.TryGetSymbolType(symbol.Definition.Name, out var symbolType))
             {
-                switch (tupleType)
+                switch (symbolType)
                 {
-                    case ExampleTupleDefinitionType.Example:
+                    case ExampleSymbolDefinitionType.Example:
                         {
-                            var row = (ExampleRow)this.BackendHelper.CreateRow(section, tuple, output, ExampleTableDefinitions.ExampleTable);
-                            row.Example = tuple.Id.Id;
-                            row.Value = tuple[0].AsString();
+                            var row = (ExampleRow)this.BackendHelper.CreateRow(section, symbol, output, ExampleTableDefinitions.ExampleTable);
+                            row.Example = symbol.Id.Id;
+                            row.Value = symbol[0].AsString();
                         }
                         return true;
                 }
             }
 
-            return base.TryAddTupleToOutput(section, tuple, output, tableDefinitions);
+            return base.TryAddSymbolToOutput(section, symbol, output, tableDefinitions);
         }
     }
 }