Better management of encapsulated generics types

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -867,7 +867,8 @@ public void TypeTesting(string expression, Type type)
         #region Generic types Management
 
         [TestCase("List(\"Hello\", \"Test\").Cast<string>().ToList<string>().GetType()", ExpectedResult = typeof(List<string>) , Category = "List function, Generics")]
-        [TestCase("new List<string>().GetType()", ExpectedResult = typeof(List<string>) , Category = "List function, Generics")]
+        [TestCase("new List<string>().GetType()", ExpectedResult = typeof(List<string>) , Category = "new Keyword, Generics")]
+        [TestCase("new Dictionary<string,List<int>>().GetType()", ExpectedResult = typeof(Dictionary<string, List<int>>) , Category = "new Keyword, Generics")]
 
         #endregion
 

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -35,7 +35,8 @@ public class ExpressionEvaluator
         private static readonly Regex internalCharRegex = new Regex(@"^['](\\[']|[^'])*[']");
         private static readonly Regex indexingBeginningRegex = new Regex(@"^[?]?\[");
         private static readonly Regex assignationOrPostFixOperatorRegex = new Regex(@"^\s*((?<assignmentPrefix>[+\-*/%&|^]|<<|>>)?=(?![=>])|(?<postfixOperator>([+][+]|--)(?![" + diactiticsKeywordsRegexPattern + @"0-9])))");
-        private static readonly Regex genericsDecodeRegex = new Regex("[^,<>]+(?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?", RegexOptions.Compiled);
+        private static readonly Regex genericsDecodeRegex = new Regex("(?<name>[^,<>]+)(?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?", RegexOptions.Compiled);
+        private static readonly Regex genericsEndOnlyOneTrim = new Regex(@"\s+[>]\s+$");
 
         private static readonly Regex endOfStringWithDollar = new Regex("^([^\"{\\\\]|\\\\[\\\\\"0abfnrtv])*[\"{]");
         private static readonly Regex endOfStringWithoutDollar = new Regex("^([^\"\\\\]|\\\\[\\\\\"0abfnrtv])*[\"]");
@@ -50,9 +51,9 @@ public class ExpressionEvaluator
 
 
         // Depending on OptionInlineNamespacesEvaluationActive. Initialized in constructor
-        private string CastRegexPattern { get { return $@"^\(\s*(?<typeName>[{ diactiticsKeywordsRegexPattern }][{ diactiticsKeywordsRegexPattern }0-9\{ (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) }[\]<>]*[?]?)\s*\)"; } }
         private string InstanceCreationWithNewKeywordRegexPattern { get { return $@"^new\s+(?<name>[{ diactiticsKeywordsRegexPattern }][{ diactiticsKeywordsRegexPattern}0-9{ (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) }]*)\s*(?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?\s*((?<isfunction>[(])|(?<isArray>\[))?"; } }
         private Regex instanceCreationWithNewKeywordRegex = null;
+        private string CastRegexPattern { get { return $@"^\(\s*(?<typeName>[{ diactiticsKeywordsRegexPattern }][{ diactiticsKeywordsRegexPattern }0-9\{ (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) }[\]<>]*[?]?)\s*\)"; } }
         private Regex castRegex = null;
 
         private static readonly string primaryTypesRegexPattern = @"(?<=^|[^" + diactiticsKeywordsRegexPattern + @"])(?<primaryType>object|string|bool[?]?|byte[?]?|char[?]?|decimal[?]?|double[?]?|short[?]?|int[?]?|long[?]?|sbyte[?]?|float[?]?|ushort[?]?|uint[?]?|void)(?=[^a-zA-Z_]|$)";
@@ -1348,6 +1349,7 @@ private bool EvaluateCast(string restOfExpression, Stack<object> stack, ref int
             if (castMatch.Success)
             {
                 string typeName = castMatch.Groups["typeName"].Value;
+
                 Type type = GetTypeByFriendlyName(typeName);
 
                 if (type != null)
@@ -1426,7 +1428,7 @@ private bool EvaluateInstanceCreationWithNewKeyword(string expr, string restOfEx
                     List<string> constructorArgs = GetExpressionsBetweenParenthesesOrOtherImbricableBrackets(expr, ref i, true);
 
                     if (type == null)
-                        throw new ExpressionEvaluatorSyntaxErrorException($"type or class {completeName} is unknown");
+                        throw new ExpressionEvaluatorSyntaxErrorException($"Type or class {completeName}{genericTypes} is unknown");
 
                     List<object> cArgs = constructorArgs.ConvertAll(arg => Evaluate(arg));
                     stack.Push(Activator.CreateInstance(type, cArgs.ToArray()));
@@ -2499,9 +2501,9 @@ private MethodInfo MakeConcreteMethodIfGeneric(MethodInfo methodInfo, string gen
         private Type[] GetConcreteTypes(string genericsTypes)
         {
             return genericsDecodeRegex
-                .Matches(genericsTypes.TrimStart(' ', '<').TrimEnd(' ', '>'))
+                .Matches(genericsEndOnlyOneTrim.Replace(genericsTypes.TrimStart(' ', '<'), ""))
                 .Cast<Match>()
-                .Select(match => GetTypeByFriendlyName(match.Value))
+                .Select(match => GetTypeByFriendlyName(match.Groups["name"].Value, match.Groups["isgeneric"].Value, true))
                 .ToArray();
         }
 
@@ -2660,7 +2662,7 @@ private bool DefaultFunctions(string name, List<string> args, out object result)
             return functionExists;
         }
 
-        private Type GetTypeByFriendlyName(string typeName, string genericTypes = "")
+        private Type GetTypeByFriendlyName(string typeName, string genericTypes = "", bool throwExceptionIfNotFound = false)
         {
             Type result = null;
             try
@@ -2703,11 +2705,18 @@ private Type GetTypeByFriendlyName(string typeName, string genericTypes = "")
                     }
                 }
             }
+            catch(ExpressionEvaluatorSyntaxErrorException)
+            {
+                throw;
+            }
             catch { }
 
             if (result != null && TypesToBlock.Contains(result))
                 result = null;
 
+            if (result == null && throwExceptionIfNotFound)
+                throw new ExpressionEvaluatorSyntaxErrorException($"Type or class {typeName}{genericTypes} is unknown");
+
             return result;
         }