Refactor SimpleAST for clear distinction between expressions and locations

src/Castle.Core/DynamicProxy/Contributors/ClassProxySerializableContributor.cs

@@ -33,7 +33,7 @@ internal class ClassProxySerializableContributor : SerializableContributor
 	{
 		private bool delegateToBaseGetObjectData;
 		private ConstructorInfo serializationConstructor;
-		private readonly IList<FieldReference> serializedFields = new List<FieldReference>();
+		private readonly IList<FieldLocation> serializedFields = new List<FieldLocation>();
 
 		public ClassProxySerializableContributor(Type targetType, Type[] interfaces, string typeId)
 			: base(targetType, interfaces, typeId)
@@ -82,15 +82,15 @@ public override void Generate(ClassEmitter @class)
 			Constructor(@class);
 		}
 
-		protected override void AddAddValueInvocation(ArgumentReference serializationInfo, MethodEmitter getObjectData,
-		                                              FieldReference field)
+		protected override void AddAddValueInvocation(ArgumentLocation serializationInfo, MethodEmitter getObjectData,
+		                                              FieldLocation field)
 		{
 			serializedFields.Add(field);
 			base.AddAddValueInvocation(serializationInfo, getObjectData, field);
 		}
 
-		protected override void CustomizeGetObjectData(CodeBuilder codeBuilder, ArgumentReference serializationInfo,
-		                                               ArgumentReference streamingContext, ClassEmitter emitter)
+		protected override void CustomizeGetObjectData(CodeBuilder codeBuilder, ArgumentLocation serializationInfo,
+		                                               ArgumentLocation streamingContext, ClassEmitter emitter)
 		{
 			codeBuilder.AddStatement(
 				new MethodInvocationExpression(
@@ -108,7 +108,7 @@ protected override void CustomizeGetObjectData(CodeBuilder codeBuilder, Argument
 			EmitCallToBaseGetObjectData(codeBuilder, serializationInfo, streamingContext);
 		}
 
-		private void EmitCustomGetObjectData(CodeBuilder codeBuilder, ArgumentReference serializationInfo)
+		private void EmitCustomGetObjectData(CodeBuilder codeBuilder, ArgumentLocation serializationInfo)
 		{
 			var members = codeBuilder.DeclareLocal(typeof(MemberInfo[]));
 			var data = codeBuilder.DeclareLocal(typeof(object[]));
@@ -129,7 +129,7 @@ private void EmitCustomGetObjectData(CodeBuilder codeBuilder, ArgumentReference
 			var getObjectData = new MethodInvocationExpression(
 				null,
 				FormatterServicesMethods.GetObjectData,
-				SelfReference.Self,
+				ThisExpression.Instance,
 				members);
 			codeBuilder.AddStatement(new AssignStatement(data, getObjectData));
 
@@ -141,14 +141,15 @@ private void EmitCustomGetObjectData(CodeBuilder codeBuilder, ArgumentReference
 			codeBuilder.AddStatement(addValue);
 		}
 
-		private void EmitCallToBaseGetObjectData(CodeBuilder codeBuilder, ArgumentReference serializationInfo,
-		                                         ArgumentReference streamingContext)
+		private void EmitCallToBaseGetObjectData(CodeBuilder codeBuilder, ArgumentLocation serializationInfo,
+		                                         ArgumentLocation streamingContext)
 		{
 			var baseGetObjectData = targetType.GetMethod("GetObjectData",
 			                                             new[] { typeof(SerializationInfo), typeof(StreamingContext) });
 
 			codeBuilder.AddStatement(
 				new MethodInvocationExpression(
+					ThisExpression.Instance,
 					baseGetObjectData,
 					serializationInfo,
 					streamingContext));
@@ -165,8 +166,8 @@ private void Constructor(ClassEmitter emitter)
 
 		private void GenerateSerializationConstructor(ClassEmitter emitter)
 		{
-			var serializationInfo = new ArgumentReference(typeof(SerializationInfo));
-			var streamingContext = new ArgumentReference(typeof(StreamingContext));
+			var serializationInfo = new ArgumentLocation(typeof(SerializationInfo));
+			var streamingContext = new ArgumentLocation(typeof(StreamingContext));
 
 			var ctor = emitter.CreateConstructor(serializationInfo, streamingContext);
 

src/Castle.Core/DynamicProxy/Contributors/ClassProxyTargetContributor.cs

@@ -78,13 +78,13 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm
 
 			var invocation = GetInvocationType(method, @class);
 
-			GetTargetExpressionDelegate getTargetTypeExpression = (c, m) => new TypeTokenExpression(targetType);
+			GetTargetExpressionDelegate getTargetType = (c, m) => new TypeTokenExpression(targetType);
 
 			return new MethodWithInvocationGenerator(method,
 			                                         @class.GetField("__interceptors"),
 			                                         invocation,
-			                                         getTargetTypeExpression,
-			                                         getTargetTypeExpression,
+			                                         getTargetType,
+			                                         getTargetType,
 			                                         overrideMethod,
 			                                         null);
 		}
@@ -122,7 +122,7 @@ private MethodBuilder CreateCallbackMethod(ClassEmitter emitter, MethodInfo meth
 
 			callBackMethod.CodeBuilder.AddStatement(
 				new ReturnStatement(
-					new MethodInvocationExpression(SelfReference.Self,
+					new MethodInvocationExpression(ThisExpression.Instance,
 					                               targetMethod,
 					                               callBackMethod.Arguments)));
 
@@ -158,7 +158,7 @@ private IInvocationCreationContributor GetContributor(Type @delegate, MetaMethod
 			}
 			return new InvocationWithGenericDelegateContributor(@delegate,
 			                                                    method,
-			                                                    new FieldReference(InvocationMethods.ProxyObject));
+			                                                    new FieldLocation(InvocationMethods.ProxyObject));
 		}
 
 		private Type GetDelegateType(MetaMethod method, ClassEmitter @class)

src/Castle.Core/DynamicProxy/Contributors/ClassProxyWithTargetTargetContributor.cs

@@ -109,7 +109,7 @@ private IInvocationCreationContributor GetContributor(Type @delegate, MetaMethod
 			}
 			return new InvocationWithGenericDelegateContributor(@delegate,
 			                                                    method,
-			                                                    new FieldReference(InvocationMethods.CompositionInvocationTarget));
+			                                                    new FieldLocation(InvocationMethods.CompositionInvocationTarget));
 		}
 
 		private Type GetDelegateType(MetaMethod method, ClassEmitter @class)

src/Castle.Core/DynamicProxy/Contributors/Delegates.cs

@@ -23,6 +23,4 @@ internal delegate MethodEmitter OverrideMethodDelegate(
 		string name, MethodAttributes attributes, MethodInfo methodToOverride);
 
 	internal delegate IExpression GetTargetExpressionDelegate(ClassEmitter @class, MethodInfo method);
-
-	internal delegate Reference GetTargetReferenceDelegate(ClassEmitter @class, MethodInfo method);
 }

src/Castle.Core/DynamicProxy/Contributors/IInvocationCreationContributor.cs

@@ -21,12 +21,12 @@ namespace Castle.DynamicProxy.Contributors
 
 	internal interface IInvocationCreationContributor
 	{
-		ConstructorEmitter CreateConstructor(ArgumentReference[] baseCtorArguments, AbstractTypeEmitter invocation);
+		ConstructorEmitter CreateConstructor(ArgumentLocation[] baseCtorArguments, AbstractTypeEmitter invocation);
 
 		MethodInfo GetCallbackMethod();
 
 		MethodInvocationExpression GetCallbackMethodInvocation(AbstractTypeEmitter invocation, IExpression[] args,
-		                                                       Reference targetField, MethodEmitter invokeMethodOnTarget);
+		                                                       Location targetField, MethodEmitter invokeMethodOnTarget);
 
 		IExpression[] GetConstructorInvocationArguments(IExpression[] arguments, ClassEmitter proxy);
 	}

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxySerializableContributor.cs

@@ -29,8 +29,8 @@ public InterfaceProxySerializableContributor(Type targetType, string proxyGenera
 		{
 		}
 
-		protected override void CustomizeGetObjectData(CodeBuilder codeBuilder, ArgumentReference serializationInfo,
-		                                               ArgumentReference streamingContext, ClassEmitter emitter)
+		protected override void CustomizeGetObjectData(CodeBuilder codeBuilder, ArgumentLocation serializationInfo,
+		                                               ArgumentLocation streamingContext, ClassEmitter emitter)
 		{
 			var targetField = emitter.GetField("__target");
 

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithOptionalTargetContributor.cs

@@ -19,13 +19,9 @@ namespace Castle.DynamicProxy.Contributors
 
 	internal class InterfaceProxyWithOptionalTargetContributor : InterfaceProxyWithoutTargetContributor
 	{
-		private readonly GetTargetReferenceDelegate getTargetReference;
-
-		public InterfaceProxyWithOptionalTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget,
-		                                                   GetTargetReferenceDelegate getTargetReference)
+		public InterfaceProxyWithOptionalTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget)
 			: base(namingScope, getTarget)
 		{
-			this.getTargetReference = getTargetReference;
 			canChangeTarget = true;
 		}
 
@@ -34,7 +30,7 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm
 		{
 			if (!method.Proxyable)
 			{
-				return new OptionallyForwardingMethodGenerator(method, overrideMethod, getTargetReference);
+				return new OptionallyForwardingMethodGenerator(method, overrideMethod, getTarget);
 			}
 
 			return base.GetMethodGenerator(method, @class, overrideMethod);

src/Castle.Core/DynamicProxy/Contributors/InterfaceProxyWithoutTargetContributor.cs

@@ -26,13 +26,13 @@ namespace Castle.DynamicProxy.Contributors
 
 	internal class InterfaceProxyWithoutTargetContributor : CompositeTypeContributor
 	{
-		private readonly GetTargetExpressionDelegate getTargetExpression;
+		protected readonly GetTargetExpressionDelegate getTarget;
 		protected bool canChangeTarget = false;
 
 		public InterfaceProxyWithoutTargetContributor(INamingScope namingScope, GetTargetExpressionDelegate getTarget)
 			: base(namingScope)
 		{
-			getTargetExpression = getTarget;
+			this.getTarget = getTarget;
 		}
 
 		protected override IEnumerable<MembersCollector> GetCollectors()
@@ -56,7 +56,7 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm
 			return new MethodWithInvocationGenerator(method,
 			                                         @class.GetField("__interceptors"),
 			                                         invocation,
-			                                         getTargetExpression,
+			                                         getTarget,
 			                                         overrideMethod,
 			                                         null);
 		}
@@ -119,7 +119,7 @@ private MethodInfo CreateCallbackMethod(ClassEmitter emitter, MethodInfo methodI
 
 			callBackMethod.CodeBuilder.AddStatement(
 				new ReturnStatement(
-					new MethodInvocationExpression(SelfReference.Self, targetMethod, callBackMethod.Arguments)));
+					new MethodInvocationExpression(ThisExpression.Instance, targetMethod, callBackMethod.Arguments)));
 
 			return callBackMethod.MethodBuilder;
 		}

src/Castle.Core/DynamicProxy/Contributors/InvocationWithDelegateContributor.cs

@@ -40,7 +40,7 @@ public InvocationWithDelegateContributor(Type delegateType, Type targetType, Met
 			this.namingScope = namingScope;
 		}
 
-		public ConstructorEmitter CreateConstructor(ArgumentReference[] baseCtorArguments, AbstractTypeEmitter invocation)
+		public ConstructorEmitter CreateConstructor(ArgumentLocation[] baseCtorArguments, AbstractTypeEmitter invocation)
 		{
 			var arguments = GetArguments(baseCtorArguments);
 			var constructor = invocation.CreateConstructor(arguments);
@@ -56,11 +56,11 @@ public MethodInfo GetCallbackMethod()
 		}
 
 		public MethodInvocationExpression GetCallbackMethodInvocation(AbstractTypeEmitter invocation, IExpression[] args,
-		                                                              Reference targetField,
+		                                                              Location targetField,
 		                                                              MethodEmitter invokeMethodOnTarget)
 		{
 			var allArgs = GetAllArgs(args, targetField);
-			var @delegate = (Reference)invocation.GetField("delegate");
+			var @delegate = (Location)invocation.GetField("delegate");
 
 			return new MethodInvocationExpression(@delegate, GetCallbackMethod(), allArgs);
 		}
@@ -73,7 +73,7 @@ public IExpression[] GetConstructorInvocationArguments(IExpression[] arguments,
 			return allArguments;
 		}
 
-		private FieldReference BuildDelegateToken(ClassEmitter proxy)
+		private FieldLocation BuildDelegateToken(ClassEmitter proxy)
 		{
 			var callback = proxy.CreateStaticField(namingScope.GetUniqueName("callback_" + method.Method.Name), delegateType);
 			var createDelegate = new MethodInvocationExpression(
@@ -88,18 +88,18 @@ private FieldReference BuildDelegateToken(ClassEmitter proxy)
 			return callback;
 		}
 
-		private IExpression[] GetAllArgs(IExpression[] args, Reference targetField)
+		private IExpression[] GetAllArgs(IExpression[] args, Location targetField)
 		{
 			var allArgs = new IExpression[args.Length + 1];
 			args.CopyTo(allArgs, 1);
 			allArgs[0] = new ConvertExpression(targetType, targetField);
 			return allArgs;
 		}
 
-		private ArgumentReference[] GetArguments(ArgumentReference[] baseCtorArguments)
+		private ArgumentLocation[] GetArguments(ArgumentLocation[] baseCtorArguments)
 		{
-			var arguments = new ArgumentReference[baseCtorArguments.Length + 1];
-			arguments[0] = new ArgumentReference(delegateType);
+			var arguments = new ArgumentLocation[baseCtorArguments.Length + 1];
+			arguments[0] = new ArgumentLocation(delegateType);
 			baseCtorArguments.CopyTo(arguments, 1);
 			return arguments;
 		}

src/Castle.Core/DynamicProxy/Contributors/InvocationWithGenericDelegateContributor.cs

@@ -29,17 +29,17 @@ internal class InvocationWithGenericDelegateContributor : IInvocationCreationCon
 	{
 		private readonly Type delegateType;
 		private readonly MetaMethod method;
-		private readonly Reference targetReference;
+		private readonly IExpression target;
 
-		public InvocationWithGenericDelegateContributor(Type delegateType, MetaMethod method, Reference targetReference)
+		public InvocationWithGenericDelegateContributor(Type delegateType, MetaMethod method, IExpression target)
 		{
 			Debug.Assert(delegateType.IsGenericType, "delegateType.IsGenericType");
 			this.delegateType = delegateType;
 			this.method = method;
-			this.targetReference = targetReference;
+			this.target = target;
 		}
 
-		public ConstructorEmitter CreateConstructor(ArgumentReference[] baseCtorArguments, AbstractTypeEmitter invocation)
+		public ConstructorEmitter CreateConstructor(ArgumentLocation[] baseCtorArguments, AbstractTypeEmitter invocation)
 		{
 			return invocation.CreateConstructor(baseCtorArguments);
 		}
@@ -50,7 +50,7 @@ public MethodInfo GetCallbackMethod()
 		}
 
 		public MethodInvocationExpression GetCallbackMethodInvocation(AbstractTypeEmitter invocation, IExpression[] args,
-		                                                              Reference targetField,
+		                                                              Location targetField,
 		                                                              MethodEmitter invokeMethodOnTarget)
 		{
 			var @delegate = GetDelegate(invocation, invokeMethodOnTarget);
@@ -62,25 +62,25 @@ public IExpression[] GetConstructorInvocationArguments(IExpression[] arguments,
 			return arguments;
 		}
 
-		private Reference GetDelegate(AbstractTypeEmitter invocation, MethodEmitter invokeMethodOnTarget)
+		private Location GetDelegate(AbstractTypeEmitter invocation, MethodEmitter invokeMethodOnTarget)
 		{
 			var genericTypeParameters = invocation.GenericTypeParams.AsTypeArray();
 			var closedDelegateType = delegateType.MakeGenericType(genericTypeParameters);
 			var localReference = invokeMethodOnTarget.CodeBuilder.DeclareLocal(closedDelegateType);
 			var closedMethodOnTarget = method.MethodOnTarget.MakeGenericMethod(genericTypeParameters);
 			invokeMethodOnTarget.CodeBuilder.AddStatement(
-				SetDelegate(localReference, targetReference, closedDelegateType, closedMethodOnTarget));
+				SetDelegate(localReference, target, closedDelegateType, closedMethodOnTarget));
 			return localReference;
 		}
 
-		private AssignStatement SetDelegate(LocalReference localDelegate, Reference localTarget,
+		private AssignStatement SetDelegate(LocalLocation localDelegate, IExpression target,
 		                                    Type closedDelegateType, MethodInfo closedMethodOnTarget)
 		{
 			var delegateCreateDelegate = new MethodInvocationExpression(
 				null,
 				DelegateMethods.CreateDelegate,
 				new TypeTokenExpression(closedDelegateType),
-				localTarget,
+				target,
 				new MethodTokenExpression(closedMethodOnTarget));
 			return new AssignStatement(localDelegate, new ConvertExpression(closedDelegateType, delegateCreateDelegate));
 		}

src/Castle.Core/DynamicProxy/Contributors/MixinContributor.cs

@@ -28,17 +28,17 @@ internal class MixinContributor : CompositeTypeContributor
 	{
 		private readonly bool canChangeTarget;
 		private readonly IList<Type> empty = new List<Type>();
-		private readonly IDictionary<Type, FieldReference> fields = new SortedDictionary<Type, FieldReference>(new FieldReferenceComparer());
-		private readonly GetTargetExpressionDelegate getTargetExpression;
+		private readonly IDictionary<Type, FieldLocation> fields = new SortedDictionary<Type, FieldLocation>(new FieldReferenceComparer());
+		private readonly GetTargetExpressionDelegate getTarget;
 
 		public MixinContributor(INamingScope namingScope, bool canChangeTarget)
 			: base(namingScope)
 		{
 			this.canChangeTarget = canChangeTarget;
-			getTargetExpression = BuildGetTargetExpression();
+			getTarget = BuildGetTargetExpression();
 		}
 
-		public IEnumerable<FieldReference> Fields
+		public IEnumerable<FieldLocation> Fields
 		{
 			get { return fields.Values; }
 		}
@@ -101,7 +101,7 @@ protected override MethodGenerator GetMethodGenerator(MetaMethod method, ClassEm
 			return new MethodWithInvocationGenerator(method,
 			                                         @class.GetField("__interceptors"),
 			                                         invocation,
-			                                         getTargetExpression,
+			                                         getTarget,
 			                                         overrideMethod,
 			                                         null);
 		}
@@ -114,11 +114,11 @@ private GetTargetExpressionDelegate BuildGetTargetExpression()
 			}
 
 			return (c, m) => new NullCoalescingOperatorExpression(
-			                 	new AsTypeReference(c.GetField("__target"), m.DeclaringType),
+			                 	new AsTypeExpression(c.GetField("__target"), m.DeclaringType),
 			                 	fields[m.DeclaringType]);
 		}
 
-		private FieldReference BuildTargetField(ClassEmitter @class, Type type)
+		private FieldLocation BuildTargetField(ClassEmitter @class, Type type)
 		{
 			var name = "__mixin_" + type.FullName.Replace(".", "_");
 			return @class.CreateField(namingScope.GetUniqueName(name), type);