Skip to content

Commit 67dddbc

Browse files
committed
Correction of generic type resolution (use AssemblyQualifiedName) and more []
1 parent cecaa08 commit 67dddbc

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,6 +1678,15 @@ void Evaluator_PreEvaluateVariable(object sender, VariablePreEvaluationEventArg
16781678
.SetCategory("var evaluation priority");
16791679

16801680
#endregion
1681+
1682+
#region bug resolution
1683+
1684+
yield return new TestCaseData(new ExpressionEvaluator()
1685+
, "(new List<Regex>()).GetType()")
1686+
.Returns(typeof(List<Regex>))
1687+
.SetCategory("Bug resolution");
1688+
1689+
#endregion
16811690
}
16821691
}
16831692

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************************************
22
Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
3-
Version : 1.3.7.1
3+
Version : 1.3.7.2
44
(if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
55
66
Author : Coding Seb
@@ -3089,7 +3089,7 @@ private Type GetTypeByFriendlyName(string typeName, string genericTypes = "", bo
30893089
if (!genericTypes.Equals(string.Empty))
30903090
{
30913091
Type[] types = GetConcreteTypes(genericTypes);
3092-
formatedGenericTypes = $"`{types.Length}[{ string.Join(", ", types.Select(type => type.FullName))}]";
3092+
formatedGenericTypes = $"`{types.Length}[{ string.Join(", ", types.Select(type => "[" + type.AssemblyQualifiedName + "]"))}]";
30933093
}
30943094

30953095
result = Type.GetType(typeName + formatedGenericTypes, false, !OptionCaseSensitiveEvaluationActive);

0 commit comments

Comments
 (0)