Merge branch 'perf/tokenizer'

Author: Antaris

libs/FuManchu/Renderer/RenderContext.cs

@@ -18,7 +18,7 @@ namespace FuManchu.Renderer;
 public class RenderContext
 {
 	readonly Map _variables = new Map();
-	Map _parameters = new Map();
+	readonly Map _parameters = new Map();
 
 	/// <summary>
 	/// Initializes a new instance of the <see cref="RenderContext"/> class.
@@ -122,6 +122,12 @@ public RenderContextScope BeginScope(object? model)
 		return @default;
 	}
 
+	/// <summary>
+	/// Gets the parameters of the context.
+	/// </summary>
+	/// <returns>The parameters.</returns>
+	public Map GetParameters() => _parameters;
+
 	/// <summary>
 	/// Resolves the value represented by the given span.
 	/// </summary>
@@ -325,7 +331,7 @@ public void SetVariable(string name, object value)
 	/// </summary>
 	/// <param name="name">The name of the variable.</param>
 	/// <param name="value">The variable value.</param>
-	public void SetParameter(string name, object value)
+	public void SetParameter(string name, object? value)
 	{
 		_parameters[name] = value;
 	}
@@ -336,6 +342,12 @@ public void SetParameter(string name, object value)
 	/// <param name="parameters">The parameter map.</param>
 	public void SetParameters(Map parameters)
 	{
-		_parameters = parameters ?? new();
+		if (parameters is { Count: > 0 })
+		{
+			foreach (var parameter in parameters)
+			{
+				SetParameter(parameter.Key, parameter.Value);
+			}
+		}
 	}
 }

libs/FuManchu/Renderer/RenderContextFactory.cs

@@ -71,6 +71,12 @@ public static RenderContext CreateRenderContext(RenderContext parent, object? mo
 			UnknownValueResolver = parent.UnknownValueResolver
 		};
 
+		var parameters = parent.GetParameters();
+		if (parameters is { Count: >0 })
+		{
+			context.SetParameters(parameters);
+		}
+
 		// Set the root context 
 		context.RootRenderContext = parent.RootRenderContext ?? parent;
 

tests/FuManchu.Tests/Verification/ComplexDocumentFacts.CanVerifyComplexDocument.verified.txt

@@ -269,6 +269,13 @@
   <strong>Billing Address</strong>
   <div>
 
+    Matthew Abbott,<br />
+    1 Somestreet Lane,<br />
+    
+    Somewhere,<br />
+    Co. Somewhere,<br />
+    AA11 1AA,<br />United Kingdom
+    
   </div>
 </div>