revert last change

Author: kostat

ExTree/ExTree.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Streamx.Linq.ExTree</AssemblyName>
-    <VersionPrefix>3.1.9</VersionPrefix>
+    <VersionPrefix>3.1.10</VersionPrefix>
     <!--<VersionSuffix>preview</VersionSuffix>-->
   </PropertyGroup>
 

ExTree/ExpressionTree.cs

@@ -25,11 +25,13 @@ public static Expression<TDelegate> Parse<TDelegate>(object target, MethodInfo m
         }
 
         private readonly struct CacheEntry {
-            public readonly Expression                 Body;
+            public readonly Expression Body;
+            public readonly Expression Target;
             public readonly IList<ParameterExpression> Parameters;
 
-            public CacheEntry(Expression body, IList<ParameterExpression> parameters) {
-                Body       = body;
+            public CacheEntry(Expression body, Expression target, IList<ParameterExpression> parameters) {
+                Body = body;
+                Target = target;
                 Parameters = parameters;
             }
         }
@@ -121,6 +123,12 @@ public static LambdaExpression Parse(Type delegateType, Expression targetExpress
 
             {
                 var map = new Dictionary<Expression, Expression>();
+                var target = targetExpression;
+                if (target != null) {
+                    target = Expression.Constant(targetExpression.Type.IsValueType ? Activator.CreateInstance(targetExpression.Type) : null,
+                        targetExpression.Type);
+                    map.Add(targetExpression, target);
+                }
 
                 if (arguments != null) {
                     for (var i = 0; i < arguments.Count; i++) {
@@ -133,7 +141,7 @@ public static LambdaExpression Parse(Type delegateType, Expression targetExpress
                 lock (CACHE) {
                     if (!CACHE.TryGetValue(cacheKey, out cached)) {
 
-                        cached = new CacheEntry(body, parameters);
+                        cached = new CacheEntry(body, target, parameters);
                         CACHE.Add(cacheKey, cached);
                     }
                 }
@@ -143,8 +151,10 @@ public static LambdaExpression Parse(Type delegateType, Expression targetExpress
 
             Expression bind(CacheEntry entry) {
                 Expression cachedBody = entry.Body;
-                if (parameters.Any()) {
+                if (entry.Target != null || parameters.Any()) {
                     var map = new Dictionary<Expression, Expression>();
+                    if (entry.Target != null)
+                        map.Add(entry.Target, targetExpression);
 
                     for (var i = 0; i < entry.Parameters.Count; i++) {
                         var arg = arguments?[i];