Caching types resolution OK

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -451,8 +451,22 @@ private enum TryBlockEvaluatedState
 
         #region Caching
 
+        /// <summary>
+        /// if set to <c>true</c> use a cache for types that were resolved to resolve faster next time.
+        /// if set to <c>false</c> the cach of types resolution is not use for this instance of ExpressionEvaluator.
+        /// Default : false
+        /// the cache is the static Dictionary TypesResolutionCaching (so it is shared by all instances of ExpressionEvaluator that have CacheTypesResolutions enabled)
+        /// </summary>
+        public bool CacheTypesResolutions { get; set; } = false;
+
+        /// <summary>
+        /// A shared cache for types resolution.
+        /// </summary>
         public static IDictionary<string, Type> TypesResolutionCaching { get; set; } = new Dictionary<string, Type>();
 
+        /// <summary>
+        /// Clear all ExpressionEvaluator caches
+        /// </summary>
         public static void ClearAllCaches()
         {
             TypesResolutionCaching.Clear();
@@ -2980,20 +2994,29 @@ private bool DefaultFunctions(string name, List<string> args, out object result)
         private Type GetTypeByFriendlyName(string typeName, string genericTypes = "", bool throwExceptionIfNotFound = false)
         {
             Type result = null;
+            string formatedGenericTypes = string.Empty;
+            bool isCached = false;
             try
             {
                 typeName = typeName.Replace(" ", "").Replace("\t", "").Replace("\r", "").Replace("\n", "");
                 genericTypes = genericTypes.Replace(" ", "").Replace("\t", "").Replace("\r", "").Replace("\n", "");
 
-                string formatedGenericTypes = string.Empty;
-
-                if (!genericTypes.Equals(string.Empty))
+                if (CacheTypesResolutions && (TypesResolutionCaching?.ContainsKey(typeName + genericTypes) ?? false))
                 {
-                    Type[] types = GetConcreteTypes(genericTypes);
-                    formatedGenericTypes = $"`{types.Length}[{ string.Join(", ", types.Select(type => type.FullName))}]";
+                    result = TypesResolutionCaching[typeName + genericTypes];
+                    isCached = true;
                 }
 
-                result = Type.GetType(typeName + formatedGenericTypes, false, !OptionCaseSensitiveEvaluationActive);
+                if (result == null)
+                {
+                    if (!genericTypes.Equals(string.Empty))
+                    {
+                        Type[] types = GetConcreteTypes(genericTypes);
+                        formatedGenericTypes = $"`{types.Length}[{ string.Join(", ", types.Select(type => type.FullName))}]";
+                    }
+
+                    result = Type.GetType(typeName + formatedGenericTypes, false, !OptionCaseSensitiveEvaluationActive);
+                }
 
                 if (result == null)
                 {
@@ -3035,6 +3058,9 @@ private Type GetTypeByFriendlyName(string typeName, string genericTypes = "", bo
             if (result == null && throwExceptionIfNotFound)
                 throw new ExpressionEvaluatorSyntaxErrorException($"Type or class {typeName}{genericTypes} is unknown");
 
+            if (CacheTypesResolutions && (result != null) && !isCached)
+                TypesResolutionCaching[typeName + genericTypes] = result;
+
             return result;
         }
 

TryWindow/MainWindow.xaml

@@ -15,9 +15,16 @@
                 <Label DockPanel.Dock="Left" 
                        Content="Iterations"
                        Padding="2,0"/>
+                <CheckBox x:Name="UseCachesCheckbox" 
+                          Content="Use Caches" 
+                          DockPanel.Dock="Right"
+                          VerticalAlignment="Center"
+                          Margin="5,0"/>
                 <TextBox x:Name="IterationsTextBox"
                          Text="1" />
+                
             </DockPanel>
+            
             <Button x:Name="CalculateButton" Content="_Execute" IsDefault="True" Click="CalculateButton_Click" />
             <Button x:Name="CancelButton" 
                     Content="_Cancel" 

TryWindow/MainWindow.xaml.cs

@@ -38,14 +38,16 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
 
             ExpressionEvaluator evaluator = new ExpressionEvaluator();
 
+            if (UseCachesCheckbox.IsChecked ?? false)
+                evaluator.CacheTypesResolutions = true;
+
             evaluator.Namespaces.Add("System.Windows");
             evaluator.Namespaces.Add("System.Diagnostics");
 
             evaluator.EvaluateVariable += Evaluator_EvaluateVariable;
 
             Stopwatch stopWatch = new Stopwatch();
 
-
             try
             {
                 string script = evaluator.RemoveComments(ScriptTextBox.Text);