diff --git a/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs b/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs
index 876ce47..a4caef2 100644
--- a/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs
+++ b/Source/Cloning/ExpressionTreeCloner.PropertyBased.cs
@@ -29,8 +29,6 @@ namespace Nuclex.Support.Cloning {
partial class ExpressionTreeCloner : ICloneFactory {
-#if false
-
/// Compiles a method that creates a deep clone of an object
/// Type for which a clone method will be created
/// A method that clones an object of the provided type
@@ -383,18 +381,40 @@ namespace Nuclex.Support.Cloning {
)
);
} else if(propertyType.IsValueType) {
+ ParameterExpression originalProperty = Expression.Variable(propertyType);
+ variables.Add(originalProperty);
+ ParameterExpression clonedProperty = Expression.Variable(propertyType);
+ variables.Add(clonedProperty);
+
+ transferExpressions.Add(
+ Expression.Assign(
+ originalProperty, Expression.Property(original, propertyInfo)
+ )
+ );
+ transferExpressions.Add(
+ Expression.Assign(clonedProperty, Expression.New(propertyType))
+ );
+
// A nested value type is part of the parent and will have its propertys directly
// assigned without boxing, new instance creation or anything like that.
generatePropertyBasedComplexTypeTransferExpressions(
propertyType,
- Expression.Property(original, propertyInfo),
- Expression.Property(clone, propertyInfo),
+ originalProperty,
+ clonedProperty,
variables,
transferExpressions
);
+
+ transferExpressions.Add(
+ Expression.Assign(
+ Expression.Property(clone, propertyInfo),
+ clonedProperty
+ )
+ );
+
} else {
generatePropertyBasedReferenceTypeTransferExpressions(
- original, clone, transferExpressions, propertyInfo, propertyType
+ original, clone, transferExpressions, variables, propertyInfo, propertyType
);
}
}
@@ -414,9 +434,17 @@ namespace Nuclex.Support.Cloning {
Expression original,
Expression clone,
ICollection transferExpressions,
+ ICollection variables,
PropertyInfo propertyInfo,
Type propertyType
) {
+ ParameterExpression originalProperty = Expression.Variable(propertyType);
+ variables.Add(originalProperty);
+
+ transferExpressions.Add(
+ Expression.Assign(originalProperty, Expression.Property(original, propertyInfo))
+ );
+
// Reference types and arrays require special care because they can be null,
// so gather the transfer expressions in a separate block for the null check
var propertyTransferExpressions = new List();
@@ -431,7 +459,7 @@ namespace Nuclex.Support.Cloning {
// For primitive arrays, the Array.Clone() method is sufficient
propertyClone = generatePropertyBasedPrimitiveArrayTransferExpressions(
propertyType,
- Expression.Property(original, propertyInfo),
+ originalProperty,
propertyVariables,
propertyTransferExpressions
);
@@ -439,7 +467,7 @@ namespace Nuclex.Support.Cloning {
// Arrays of complex types require manual cloning
propertyClone = generatePropertyBasedComplexArrayTransferExpressions(
propertyType,
- Expression.Property(original, propertyInfo),
+ originalProperty,
propertyVariables,
propertyTransferExpressions
);
@@ -473,12 +501,10 @@ namespace Nuclex.Support.Cloning {
Expression.Call(
Expression.Call(
getOrCreateClonerMethodInfo,
- Expression.Call(
- Expression.Property(original, propertyInfo), getTypeMethodInfo
- )
+ Expression.Call(originalProperty, getTypeMethodInfo)
),
invokeMethodInfo,
- Expression.Property(original, propertyInfo)
+ originalProperty
),
propertyType
)
@@ -491,15 +517,13 @@ namespace Nuclex.Support.Cloning {
transferExpressions.Add(
Expression.IfThen(
Expression.NotEqual(
- Expression.Property(original, propertyInfo), Expression.Constant(null)
+ originalProperty, Expression.Constant(null)
),
Expression.Block(propertyVariables, propertyTransferExpressions)
)
);
}
-#endif
-
}
} // namespace Nuclex.Support.Cloning
diff --git a/Source/Cloning/ExpressionTreeCloner.Test.cs b/Source/Cloning/ExpressionTreeCloner.Test.cs
index e0f4024..cfb2c67 100644
--- a/Source/Cloning/ExpressionTreeCloner.Test.cs
+++ b/Source/Cloning/ExpressionTreeCloner.Test.cs
@@ -172,7 +172,6 @@ namespace Nuclex.Support.Cloning {
}
#endif
-#if false
///
/// Verifies that a property-based deep clone of a value type can be performed
///
@@ -192,7 +191,6 @@ namespace Nuclex.Support.Cloning {
HierarchicalReferenceType clone = this.cloneFactory.DeepClone(original, true);
VerifyClone(original, clone, isDeepClone: true, isPropertyBasedClone: true);
}
-#endif
/// Clone factory being tested
private ICloneFactory cloneFactory;
diff --git a/Source/Cloning/ExpressionTreeCloner.cs b/Source/Cloning/ExpressionTreeCloner.cs
index 9e5cfc5..c53f9f5 100644
--- a/Source/Cloning/ExpressionTreeCloner.cs
+++ b/Source/Cloning/ExpressionTreeCloner.cs
@@ -35,6 +35,8 @@ namespace Nuclex.Support.Cloning {
static ExpressionTreeCloner() {
shallowFieldBasedCloners = new ConcurrentDictionary>();
deepFieldBasedCloners = new ConcurrentDictionary>();
+ shallowPropertyBasedCloners = new ConcurrentDictionary>();
+ deepPropertyBasedCloners = new ConcurrentDictionary>();
}
///
@@ -55,12 +57,13 @@ namespace Nuclex.Support.Cloning {
return default(TCloned);
}
+ Func