Rename Reference methods for better consistency

stakx · stakx · commit 3d3bf4a6a165 · 2025-12-16T01:30:16.000+01:00
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ArgumentReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ArgumentReference.cs
@@ -37,12 +37,12 @@ public ArgumentReference(Type argumentType, int position)
 
 		internal int Position { get; set; }
 
-		public override void LoadAddressOfReference(ILGenerator gen)
+		public override void EmitAddress(ILGenerator gen)
 		{
 			throw new NotSupportedException();
 		}
 
-		public override void LoadReference(ILGenerator gen)
+		public override void Emit(ILGenerator gen)
 		{
 			if (Position == -1)
 			{
@@ -68,7 +68,7 @@ public override void LoadReference(ILGenerator gen)
 			}
 		}
 
-		public override void StoreReference(IExpression value, ILGenerator gen)
+		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			if (Position == -1)
 			{
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AsTypeReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AsTypeReference.cs
@@ -32,20 +32,20 @@ public AsTypeReference(Reference reference, Type type)
 			this.type = type;
 		}
 
-		public override void LoadAddressOfReference(ILGenerator gen)
+		public override void EmitAddress(ILGenerator gen)
 		{
 			// It does not make sense to take the address of a cast expression.
 			// The C# language would also forbid address-taking of the form `&(x as T)`.
 			throw new NotSupportedException();
 		}
 
-		public override void LoadReference(ILGenerator gen)
+		public override void Emit(ILGenerator gen)
 		{
-			reference.LoadReference(gen);
+			reference.Emit(gen);
 			gen.Emit(OpCodes.Isinst, type);
 		}
 
-		public override void StoreReference(IExpression value, ILGenerator gen)
+		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			// It does not make sense to assign a value to the result of a cast expression.
 			// The C# language would also forbid assignments of the form `(x as T) = y`.
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AssignStatement.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/AssignStatement.cs
@@ -31,7 +31,7 @@ public AssignStatement(Reference target, IExpression value)
 
 		public void Emit(ILGenerator gen)
 		{
-			target.StoreReference(value, gen);
+			target.EmitStore(value, gen);
 		}
 	}
 }
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ByRefReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/ByRefReference.cs
@@ -32,17 +32,17 @@ public ByRefReference(LocalReference localReference)
 			this.localReference = localReference;
 		}
 
-		public override void LoadAddressOfReference(ILGenerator gen)
+		public override void EmitAddress(ILGenerator gen)
 		{
-			localReference.LoadAddressOfReference(gen);
+			localReference.EmitAddress(gen);
 		}
 
-		public override void LoadReference(ILGenerator gen)
+		public override void Emit(ILGenerator gen)
 		{
-			localReference.LoadAddressOfReference(gen);
+			localReference.EmitAddress(gen);
 		}
 
-		public override void StoreReference(IExpression value, ILGenerator gen)
+		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			throw new NotImplementedException();
 		}
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/FieldReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/FieldReference.cs
@@ -56,7 +56,7 @@ public FieldInfo Reference
 			get { return @field; }
 		}
 
-		public override void LoadAddressOfReference(ILGenerator gen)
+		public override void EmitAddress(ILGenerator gen)
 		{
 			if (isStatic)
 			{
@@ -69,7 +69,7 @@ public override void LoadAddressOfReference(ILGenerator gen)
 			}
 		}
 
-		public override void LoadReference(ILGenerator gen)
+		public override void Emit(ILGenerator gen)
 		{
 			if (isStatic)
 			{
@@ -82,7 +82,7 @@ public override void LoadReference(ILGenerator gen)
 			}
 		}
 
-		public override void StoreReference(IExpression value, ILGenerator gen)
+		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			if (isStatic)
 			{
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/IndirectReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/IndirectReference.cs
@@ -41,20 +41,18 @@ public IndirectReference(TypeReference byRefReference)
 			this.byRefReference = byRefReference;
 		}
 
-		public override void LoadAddressOfReference(ILGenerator gen)
+		public override void EmitAddress(ILGenerator gen)
 		{
 			byRefReference.Emit(gen);
 		}
 
-		// TODO: Better name
-
-		public override void LoadReference(ILGenerator gen)
+		public override void Emit(ILGenerator gen)
 		{
 			byRefReference.Emit(gen);
 			OpCodeUtil.EmitLoadIndirectOpCodeForType(gen, Type);
 		}
 
-		public override void StoreReference(IExpression value, ILGenerator gen)
+		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			byRefReference.Emit(gen);
 			value.Emit(gen);
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/LocalReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/LocalReference.cs
@@ -35,17 +35,17 @@ public override void Generate(ILGenerator gen)
 			localBuilder = gen.DeclareLocal(base.Type);
 		}
 
-		public override void LoadAddressOfReference(ILGenerator gen)
+		public override void EmitAddress(ILGenerator gen)
 		{
 			gen.Emit(OpCodes.Ldloca, localBuilder!);
 		}
 
-		public override void LoadReference(ILGenerator gen)
+		public override void Emit(ILGenerator gen)
 		{
 			gen.Emit(OpCodes.Ldloc, localBuilder!);
 		}
 
-		public override void StoreReference(IExpression value, ILGenerator gen)
+		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			value.Emit(gen);
 			gen.Emit(OpCodes.Stloc, localBuilder!);
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/Reference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/Reference.cs
@@ -20,19 +20,14 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST
 
 	internal abstract class Reference : IExpression
 	{
-		public abstract void LoadAddressOfReference(ILGenerator gen);
+		public abstract void EmitAddress(ILGenerator gen);
 
-		public abstract void LoadReference(ILGenerator gen);
+		public abstract void Emit(ILGenerator gen);
 
-		public abstract void StoreReference(IExpression value, ILGenerator gen);
+		public abstract void EmitStore(IExpression value, ILGenerator gen);
 
 		public virtual void Generate(ILGenerator gen)
 		{
 		}
-
-		public void Emit(ILGenerator gen)
-		{
-			LoadReference(gen);
-		}
 	}
 }
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/SelfReference.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/SimpleAST/SelfReference.cs
@@ -29,17 +29,17 @@ protected SelfReference()
 		{
 		}
 
-		public override void LoadAddressOfReference(ILGenerator gen)
+		public override void EmitAddress(ILGenerator gen)
 		{
 			throw new NotSupportedException();
 		}
 
-		public override void LoadReference(ILGenerator gen)
+		public override void Emit(ILGenerator gen)
 		{
 			gen.Emit(OpCodes.Ldarg_0);
 		}
 
-		public override void StoreReference(IExpression value, ILGenerator gen)
+		public override void EmitStore(IExpression value, ILGenerator gen)
 		{
 			// It does not make sense to assign a value to the this pointer.
 			throw new NotSupportedException();

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ public ArgumentReference(Type argumentType, int position)`
`37`	`37`
`38`	`38`	`internal int Position { get; set; }`
`39`	`39`
`40`		`- public override void LoadAddressOfReference(ILGenerator gen)`
	`40`	`+ public override void EmitAddress(ILGenerator gen)`
`41`	`41`	`{`
`42`	`42`	`throw new NotSupportedException();`
`43`	`43`	`}`
`44`	`44`
`45`		`- public override void LoadReference(ILGenerator gen)`
	`45`	`+ public override void Emit(ILGenerator gen)`
`46`	`46`	`{`
`47`	`47`	`if (Position == -1)`
`48`	`48`	`{`
`@@ -68,7 +68,7 @@ public override void LoadReference(ILGenerator gen)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- public override void StoreReference(IExpression value, ILGenerator gen)`
	`71`	`+ public override void EmitStore(IExpression value, ILGenerator gen)`
`72`	`72`	`{`
`73`	`73`	`if (Position == -1)`
`74`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,20 +32,20 @@ public AsTypeReference(Reference reference, Type type)`
`32`	`32`	`this.type = type;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public override void LoadAddressOfReference(ILGenerator gen)`
	`35`	`+ public override void EmitAddress(ILGenerator gen)`
`36`	`36`	`{`
`37`	`37`	`// It does not make sense to take the address of a cast expression.`
`38`	`38`	// The C# language would also forbid address-taking of the form `&(x as T)`.
`39`	`39`	`throw new NotSupportedException();`
`40`	`40`	`}`
`41`	`41`
`42`		`- public override void LoadReference(ILGenerator gen)`
	`42`	`+ public override void Emit(ILGenerator gen)`
`43`	`43`	`{`
`44`		`- reference.LoadReference(gen);`
	`44`	`+ reference.Emit(gen);`
`45`	`45`	`gen.Emit(OpCodes.Isinst, type);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public override void StoreReference(IExpression value, ILGenerator gen)`
	`48`	`+ public override void EmitStore(IExpression value, ILGenerator gen)`
`49`	`49`	`{`
`50`	`50`	`// It does not make sense to assign a value to the result of a cast expression.`
`51`	`51`	// The C# language would also forbid assignments of the form `(x as T) = y`.
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public AssignStatement(Reference target, IExpression value)`
`31`	`31`
`32`	`32`	`public void Emit(ILGenerator gen)`
`33`	`33`	`{`
`34`		`- target.StoreReference(value, gen);`
	`34`	`+ target.EmitStore(value, gen);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,17 @@ public ByRefReference(LocalReference localReference)`
`32`	`32`	`this.localReference = localReference;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public override void LoadAddressOfReference(ILGenerator gen)`
	`35`	`+ public override void EmitAddress(ILGenerator gen)`
`36`	`36`	`{`
`37`		`- localReference.LoadAddressOfReference(gen);`
	`37`	`+ localReference.EmitAddress(gen);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public override void LoadReference(ILGenerator gen)`
	`40`	`+ public override void Emit(ILGenerator gen)`
`41`	`41`	`{`
`42`		`- localReference.LoadAddressOfReference(gen);`
	`42`	`+ localReference.EmitAddress(gen);`
`43`	`43`	`}`
`44`	`44`
`45`		`- public override void StoreReference(IExpression value, ILGenerator gen)`
	`45`	`+ public override void EmitStore(IExpression value, ILGenerator gen)`
`46`	`46`	`{`
`47`	`47`	`throw new NotImplementedException();`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public FieldInfo Reference`
`56`	`56`	`get { return @field; }`
`57`	`57`	`}`
`58`	`58`
`59`		`- public override void LoadAddressOfReference(ILGenerator gen)`
	`59`	`+ public override void EmitAddress(ILGenerator gen)`
`60`	`60`	`{`
`61`	`61`	`if (isStatic)`
`62`	`62`	`{`
`@@ -69,7 +69,7 @@ public override void LoadAddressOfReference(ILGenerator gen)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- public override void LoadReference(ILGenerator gen)`
	`72`	`+ public override void Emit(ILGenerator gen)`
`73`	`73`	`{`
`74`	`74`	`if (isStatic)`
`75`	`75`	`{`
`@@ -82,7 +82,7 @@ public override void LoadReference(ILGenerator gen)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- public override void StoreReference(IExpression value, ILGenerator gen)`
	`85`	`+ public override void EmitStore(IExpression value, ILGenerator gen)`
`86`	`86`	`{`
`87`	`87`	`if (isStatic)`
`88`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,20 +41,18 @@ public IndirectReference(TypeReference byRefReference)`
`41`	`41`	`this.byRefReference = byRefReference;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public override void LoadAddressOfReference(ILGenerator gen)`
	`44`	`+ public override void EmitAddress(ILGenerator gen)`
`45`	`45`	`{`
`46`	`46`	`byRefReference.Emit(gen);`
`47`	`47`	`}`
`48`	`48`
`49`		`- // TODO: Better name`
`50`		`-`
`51`		`- public override void LoadReference(ILGenerator gen)`
	`49`	`+ public override void Emit(ILGenerator gen)`
`52`	`50`	`{`
`53`	`51`	`byRefReference.Emit(gen);`
`54`	`52`	`OpCodeUtil.EmitLoadIndirectOpCodeForType(gen, Type);`
`55`	`53`	`}`
`56`	`54`
`57`		`- public override void StoreReference(IExpression value, ILGenerator gen)`
	`55`	`+ public override void EmitStore(IExpression value, ILGenerator gen)`
`58`	`56`	`{`
`59`	`57`	`byRefReference.Emit(gen);`
`60`	`58`	`value.Emit(gen);`
Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,17 @@ public override void Generate(ILGenerator gen)`
`35`	`35`	`localBuilder = gen.DeclareLocal(base.Type);`
`36`	`36`	`}`
`37`	`37`
`38`		`- public override void LoadAddressOfReference(ILGenerator gen)`
	`38`	`+ public override void EmitAddress(ILGenerator gen)`
`39`	`39`	`{`
`40`	`40`	`gen.Emit(OpCodes.Ldloca, localBuilder!);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public override void LoadReference(ILGenerator gen)`
	`43`	`+ public override void Emit(ILGenerator gen)`
`44`	`44`	`{`
`45`	`45`	`gen.Emit(OpCodes.Ldloc, localBuilder!);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public override void StoreReference(IExpression value, ILGenerator gen)`
	`48`	`+ public override void EmitStore(IExpression value, ILGenerator gen)`
`49`	`49`	`{`
`50`	`50`	`value.Emit(gen);`
`51`	`51`	`gen.Emit(OpCodes.Stloc, localBuilder!);`
Original file line number	Diff line number	Diff line change
`@@ -20,19 +20,14 @@ namespace Castle.DynamicProxy.Generators.Emitters.SimpleAST`
`20`	`20`
`21`	`21`	`internal abstract class Reference : IExpression`
`22`	`22`	`{`
`23`		`- public abstract void LoadAddressOfReference(ILGenerator gen);`
	`23`	`+ public abstract void EmitAddress(ILGenerator gen);`
`24`	`24`
`25`		`- public abstract void LoadReference(ILGenerator gen);`
	`25`	`+ public abstract void Emit(ILGenerator gen);`
`26`	`26`
`27`		`- public abstract void StoreReference(IExpression value, ILGenerator gen);`
	`27`	`+ public abstract void EmitStore(IExpression value, ILGenerator gen);`
`28`	`28`
`29`	`29`	`public virtual void Generate(ILGenerator gen)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`		`-`
`33`		`- public void Emit(ILGenerator gen)`
`34`		`- {`
`35`		`- LoadReference(gen);`
`36`		`- }`
`37`	`32`	`}`
`38`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,17 +29,17 @@ protected SelfReference()`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`
`32`		`- public override void LoadAddressOfReference(ILGenerator gen)`
	`32`	`+ public override void EmitAddress(ILGenerator gen)`
`33`	`33`	`{`
`34`	`34`	`throw new NotSupportedException();`
`35`	`35`	`}`
`36`	`36`
`37`		`- public override void LoadReference(ILGenerator gen)`
	`37`	`+ public override void Emit(ILGenerator gen)`
`38`	`38`	`{`
`39`	`39`	`gen.Emit(OpCodes.Ldarg_0);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public override void StoreReference(IExpression value, ILGenerator gen)`
	`42`	`+ public override void EmitStore(IExpression value, ILGenerator gen)`
`43`	`43`	`{`
`44`	`44`	`// It does not make sense to assign a value to the this pointer.`
`45`	`45`	`throw new NotSupportedException();`