Implement optimized simple reference creation

2 files changed, 46 insertions, 1 deletions

diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs
index 2f65db7a..d88858ae 100644
--- a/src/WixToolset.Core/CompilerCore.cs
+++ b/src/WixToolset.Core/CompilerCore.cs
@@ -381,6 +381,26 @@ namespace WixToolset.Core
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information for the row.</param>
         /// <param name="symbolName">The symbol name of the simple reference.</param>
+        /// <param name="primaryKey">The primary key of the simple reference.</param>
+        public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, string symbolName, string primaryKey)
+        {
+            if (!this.EncounteredError)
+            {
+                var id = String.Concat(symbolName, ":", primaryKey);
+
+                // If this simple reference hasn't been added to the active section already, add it.
+                if (this.activeSectionSimpleReferences.Add(id))
+                {
+                    this.parseHelper.CreateSimpleReference(this.ActiveSection, sourceLineNumbers, symbolName, primaryKey);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create a WixSimpleReferenceSymbol in the active section.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Source line information for the row.</param>
+        /// <param name="symbolName">The symbol name of the simple reference.</param>
         /// <param name="primaryKeys">The primary keys of the simple reference.</param>
         public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, string symbolName, params string[] primaryKeys)
         {
@@ -402,6 +422,17 @@ namespace WixToolset.Core
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information for the row.</param>
         /// <param name="symbolDefinition">The symbol definition of the simple reference.</param>
+        /// <param name="primaryKey">The primary key of the simple reference.</param>
+        public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, string primaryKey)
+        {
+            this.CreateSimpleReference(sourceLineNumbers, symbolDefinition.Name, primaryKey);
+        }
+
+        /// <summary>
+        /// Create a WixSimpleReferenceSymbol in the active section.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Source line information for the row.</param>
+        /// <param name="symbolDefinition">The symbol definition of the simple reference.</param>
         /// <param name="primaryKeys">The primary keys of the simple reference.</param>
         public void CreateSimpleReference(SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, params string[] primaryKeys)
         {
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 7115017c..d9087ce3 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -225,6 +225,15 @@ namespace WixToolset.Core.ExtensibilityServices
             return symbol.Id;
         }
 
+        public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, string primaryKey)
+        {
+            section.AddSymbol(new WixSimpleReferenceSymbol(sourceLineNumbers)
+            {
+                Table = symbolName,
+                PrimaryKeys = primaryKey
+            });
+        }
+
         public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, params string[] primaryKeys)
         {
             section.AddSymbol(new WixSimpleReferenceSymbol(sourceLineNumbers)
@@ -234,6 +243,11 @@ namespace WixToolset.Core.ExtensibilityServices
             });
         }
 
+        public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, string primaryKey)
+        {
+            this.CreateSimpleReference(section, sourceLineNumbers, symbolDefinition.Name, primaryKey);
+        }
+
         public void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, params string[] primaryKeys)
         {
             this.CreateSimpleReference(section, sourceLineNumbers, symbolDefinition.Name, primaryKeys);
@@ -849,7 +863,7 @@ namespace WixToolset.Core.ExtensibilityServices
             }
             else if (allowRelative)
             {
-                return filename.IndexOfAny(Common.IllegalRelativeLongFilenameCharacters) == -1; 
+                return filename.IndexOfAny(Common.IllegalRelativeLongFilenameCharacters) == -1;
             }
             else
             {