Match other comparer logic.

Author: KN4CK3R

ReClass.NET/MemoryScanner/Comparer/DoubleMemoryComparer.cs

@@ -42,12 +42,10 @@ private bool CheckRoundedEquality(double value) =>
 
 		public bool Compare(byte[] data, int index, out ScanResult result)
 		{
-			result = null;
-
-			var value = BitConverter.ToDouble(data, index);
-
-			bool IsMatch() =>
-				CompareType switch
+			return CompareInternal(
+				data,
+				index,
+				value => CompareType switch
 			{
 					ScanCompareType.Equal => CheckRoundedEquality(value),
 					ScanCompareType.NotEqual => !CheckRoundedEquality(value),
@@ -59,18 +57,11 @@ bool IsMatch() =>
 					ScanCompareType.BetweenOrEqual => Value1 <= value && value <= Value2,
 					ScanCompareType.Unknown => true,
 					_ => throw new InvalidCompareTypeException(CompareType)
-				};
-
-			if (!IsMatch())
-			{
-				return false;
+				},
+				out result
+			);
 			}
 
-			result = new DoubleScanResult(value);
-
-			return true;
-		}
-
 		public bool Compare(byte[] data, int index, ScanResult previous, out ScanResult result)
 		{
 #if DEBUG
@@ -82,12 +73,10 @@ public bool Compare(byte[] data, int index, ScanResult previous, out ScanResult
 
 		public bool Compare(byte[] data, int index, DoubleScanResult previous, out ScanResult result)
 		{
-			result = null;
-
-			var value = BitConverter.ToDouble(data, index);
-
-			bool IsMatch() =>
-				CompareType switch
+			return CompareInternal(
+				data,
+				index,
+				value => CompareType switch
 			{
 					ScanCompareType.Equal => CheckRoundedEquality(value),
 					ScanCompareType.NotEqual => !CheckRoundedEquality(value),
@@ -104,9 +93,18 @@ bool IsMatch() =>
 					ScanCompareType.Between => Value1 < value && value < Value2,
 					ScanCompareType.BetweenOrEqual => Value1 <= value && value <= Value2,
 					_ => throw new InvalidCompareTypeException(CompareType)
-				};
+				},
+				out result
+			);
+		}
+
+		private static bool CompareInternal(byte[] data, int index, Func<double, bool> matcher, out ScanResult result)
+		{
+			result = null;
+
+			var value = BitConverter.ToDouble(data, index);
 
-			if (!IsMatch())
+			if (!matcher(value))
 			{
 				return false;
 			}

ReClass.NET/MemoryScanner/Comparer/FloatMemoryComparer.cs

@@ -42,12 +42,10 @@ private bool CheckRoundedEquality(float value) =>
 
 		public bool Compare(byte[] data, int index, out ScanResult result)
 		{
-			result = null;
-
-			var value = BitConverter.ToSingle(data, index);
-
-			bool IsMatch() =>
-				CompareType switch
+			return CompareInternal(
+				data,
+				index,
+				value => CompareType switch
 			{
 					ScanCompareType.Equal => CheckRoundedEquality(value),
 					ScanCompareType.NotEqual => !CheckRoundedEquality(value),
@@ -59,18 +57,11 @@ bool IsMatch() =>
 					ScanCompareType.BetweenOrEqual => Value1 <= value && value <= Value2,
 					ScanCompareType.Unknown => true,
 					_ => throw new InvalidCompareTypeException(CompareType)
-				};
-
-			if (!IsMatch())
-			{
-				return false;
+				},
+				out result
+			);
 			}
 
-			result = new FloatScanResult(value);
-
-			return true;
-		}
-
 		public bool Compare(byte[] data, int index, ScanResult previous, out ScanResult result)
 		{
 #if DEBUG
@@ -82,12 +73,10 @@ public bool Compare(byte[] data, int index, ScanResult previous, out ScanResult
 
 		public bool Compare(byte[] data, int index, FloatScanResult previous, out ScanResult result)
 		{
-			result = null;
-
-			var value = BitConverter.ToSingle(data, index);
-
-			bool IsMatch() =>
-				CompareType switch
+			return CompareInternal(
+				data,
+				index,
+				value => CompareType switch
 			{
 					ScanCompareType.Equal => CheckRoundedEquality(value),
 					ScanCompareType.NotEqual => !CheckRoundedEquality(value),
@@ -104,9 +93,18 @@ bool IsMatch() =>
 					ScanCompareType.Between => Value1 < value && value < Value2,
 					ScanCompareType.BetweenOrEqual => Value1 <= value && value <= Value2,
 					_ => throw new InvalidCompareTypeException(CompareType)
-				};
+				},
+				out result
+			);
+		}
+
+		private static bool CompareInternal(byte[] data, int index, Func<float, bool> matcher, out ScanResult result)
+		{
+			result = null;
+
+			var value = BitConverter.ToSingle(data, index);
 
-			if (!IsMatch())
+			if (!matcher(value))
 			{
 				return false;
 			}