Added ReadMemoryExpression tests.

KN4CK3R · KN4CK3R · commit a4b9dee823ad · 2019-04-16T16:19:56.000+02:00
diff --git a/ReClass.NET/AddressParser/DynamicCompiler.cs b/ReClass.NET/AddressParser/DynamicCompiler.cs
@@ -100,8 +100,8 @@ private static Expression GenerateMethodBody(IExpression expression, Expression
 					{
 						var argument = GenerateMethodBody(readMemoryExpression.Expression, parameter);
 
-						var functionName = readMemoryExpression.ByteCount == 4 ? nameof(IProcessReader.ReadRemoteInt32) : nameof(IProcessReader.ReadRemoteInt64);
-						var readRemoteIntFn = typeof(IProcessReader).GetRuntimeMethod(functionName, new[] { typeof(IntPtr) });
+						var functionName = readMemoryExpression.ByteCount == 4 ? nameof(IRemoteMemoryReader.ReadRemoteInt32) : nameof(IRemoteMemoryReader.ReadRemoteInt64);
+						var readRemoteIntFn = typeof(IRemoteMemoryReader).GetRuntimeMethod(functionName, new[] { typeof(IntPtr) });
 
 						var callExpression = Expression.Call(parameter, readRemoteIntFn, argument);
 
diff --git a/ReClass.NET_Tests/AddressParser/ExecutorTest.cs b/ReClass.NET_Tests/AddressParser/ExecutorTest.cs
@@ -27,7 +27,8 @@ public abstract class ExecutorTest
 			new object[] { "0 + 1", (IntPtr)0x1 },
 			new object[] { "0 - 1", (IntPtr)(-1) },
 			new object[] { "1 + 2 * 3", (IntPtr)0x7 },
-			new object[] { "0x123 + 0x234 * 0x345", (IntPtr)0x73527 }
+			new object[] { "0x123 + 0x234 * 0x345", (IntPtr)0x73527 },
+			new object[] { "4 / 0x2", (IntPtr)0x2 }
 		};
 
 		[Theory]
@@ -61,5 +62,34 @@ public void ModuleExpressionTest(string expression, IntPtr expected)
 
 			Check.That(executor.Execute(Parser.Parse(expression), mock.Object)).IsEqualTo(expected);
 		}
+
+		public static IEnumerable<object[]> GetReadMemoryExpressionTestData() => new List<object[]>
+		{
+			new object[] { "[0]", (IntPtr)0x0 },
+			new object[] { "[0] + 10", (IntPtr)0x10 },
+			new object[] { "[10]", (IntPtr)0x10 },
+			new object[] { "[10 + 10]", (IntPtr)0x20 },
+			new object[] { "[[10] + 10]", (IntPtr)0x20 },
+			new object[] { "[[10] + [10]] + [10]", (IntPtr)0x30 }
+		};
+
+		[Theory]
+		[MemberData(nameof(GetReadMemoryExpressionTestData))]
+		public void ReadMemoryExpressionTest(string expression, IntPtr expected)
+		{
+			var mock = new Mock<IProcessReader>();
+			mock.Setup(p => p.ReadRemoteInt32((IntPtr)0))
+				.Returns(0);
+			mock.Setup(p => p.ReadRemoteInt32((IntPtr)0x10))
+				.Returns(0x10);
+			mock.Setup(p => p.ReadRemoteInt32((IntPtr)0x20))
+				.Returns(0x20);
+			mock.Setup(p => p.ReadRemoteInt32((IntPtr)0x30))
+				.Returns(0x30);
+
+			var executor = CreateExecutor();
+
+			Check.That(executor.Execute(Parser.Parse(expression), mock.Object)).IsEqualTo(expected);
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,8 @@ private static Expression GenerateMethodBody(IExpression expression, Expression`
`100`	`100`	`{`
`101`	`101`	`var argument = GenerateMethodBody(readMemoryExpression.Expression, parameter);`
`102`	`102`
`103`		`- var functionName = readMemoryExpression.ByteCount == 4 ? nameof(IProcessReader.ReadRemoteInt32) : nameof(IProcessReader.ReadRemoteInt64);`
`104`		`- var readRemoteIntFn = typeof(IProcessReader).GetRuntimeMethod(functionName, new[] { typeof(IntPtr) });`
	`103`	`+ var functionName = readMemoryExpression.ByteCount == 4 ? nameof(IRemoteMemoryReader.ReadRemoteInt32) : nameof(IRemoteMemoryReader.ReadRemoteInt64);`
	`104`	`+ var readRemoteIntFn = typeof(IRemoteMemoryReader).GetRuntimeMethod(functionName, new[] { typeof(IntPtr) });`
`105`	`105`
`106`	`106`	`var callExpression = Expression.Call(parameter, readRemoteIntFn, argument);`
`107`	`107`