Merge pull request #93 from bijington/issue-91-revert-string-comparer…

…-dictionary Reverted to only wrapping the variables if we internally expect a
bijington · Jan 11, 2021 · 88903e2 · 88903e2
2 parents 50783eb + e2e4f3f
commit 88903e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Source/Expressive/Context.cs b/Source/Expressive/Context.cs
@@ -62,7 +62,7 @@ public class Context
             ? StringComparison.OrdinalIgnoreCase
             : StringComparison.Ordinal;
 
-        private bool IsCaseInsensitiveParsingEnabled =>
+        internal bool IsCaseInsensitiveParsingEnabled =>
 #pragma warning disable 618 // As it is our own warning this is safe enough until we actually get rid
             Options.HasFlag(ExpressiveOptions.IgnoreCase) || Options.HasFlag(ExpressiveOptions.IgnoreCaseForParsing);
 #pragma warning restore 618

diff --git a/Source/Expressive/Expression.cs b/Source/Expressive/Expression.cs
@@ -100,7 +100,8 @@ public object Evaluate(IDictionary<string, object> variables = null)
             {
                 this.CompileExpression();
 
-                if (variables != null)
+                if (variables != null &&
+                    this.context.IsCaseInsensitiveParsingEnabled)
                 {
                     variables = new Dictionary<string, object>(variables, this.context.ParsingStringComparer);
                 }