Moved value switch.

Author: KN4CK3R

ReClass.NET/Forms/ScannerForm.cs

@@ -734,6 +734,14 @@ private IScanComparer CreateComparer(ScanSettings settings)
 				if (!long.TryParse(dualValueBox.Value1, numberStyle, null, out var value1)) throw new InvalidInputException(dualValueBox.Value1);
 				if (!long.TryParse(dualValueBox.Value2, numberStyle, null, out var value2) && checkBothInputFields) throw new InvalidInputException(dualValueBox.Value2);
 
+				if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
+				{
+					if (value1 > value2)
+					{
+						Utils.Swap(ref value1, ref value2);
+					}
+				}
+
 				switch (settings.ValueType)
 				{
 					case ScanValueType.Byte:
@@ -769,6 +777,14 @@ int CalculateSignificantDigits(string input, NumberFormatInfo numberFormat)
 				var nf2 = NumberFormat.GuessNumberFormat(dualValueBox.Value2);
 				if (!double.TryParse(dualValueBox.Value2, NumberStyles.Float, nf2, out var value2) && checkBothInputFields) throw new InvalidInputException(dualValueBox.Value2);
 
+				if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
+				{
+					if (value1 > value2)
+					{
+						Utils.Swap(ref value1, ref value2);
+					}
+				}
+
 				var significantDigits = Math.Max(
 					CalculateSignificantDigits(dualValueBox.Value1, nf1),
 					CalculateSignificantDigits(dualValueBox.Value2, nf2)

ReClass.NET/MemoryScanner/Comparer/ByteMemoryComparer.cs

@@ -15,14 +15,6 @@ public ByteMemoryComparer(ScanCompareType compareType, byte value1, byte value2)
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}

ReClass.NET/MemoryScanner/Comparer/DoubleMemoryComparer.cs

@@ -21,14 +21,6 @@ public DoubleMemoryComparer(ScanCompareType compareType, ScanRoundMode roundType
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			RoundType = roundType;
 			this.significantDigits = Math.Max(significantDigits, 1);
 			Value1 = Math.Round(value1, this.significantDigits, MidpointRounding.AwayFromZero);

ReClass.NET/MemoryScanner/Comparer/FloatMemoryComparer.cs

@@ -21,14 +21,6 @@ public FloatMemoryComparer(ScanCompareType compareType, ScanRoundMode roundType,
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			RoundType = roundType;
 			this.significantDigits = Math.Max(significantDigits, 1);
 			Value1 = (float)Math.Round(value1, this.significantDigits, MidpointRounding.AwayFromZero);

ReClass.NET/MemoryScanner/Comparer/IntegerMemoryComparer.cs

@@ -15,14 +15,6 @@ public IntegerMemoryComparer(ScanCompareType compareType, int value1, int value2
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}

ReClass.NET/MemoryScanner/Comparer/LongMemoryComparer.cs

@@ -15,14 +15,6 @@ public LongMemoryComparer(ScanCompareType compareType, long value1, long value2)
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}

ReClass.NET/MemoryScanner/Comparer/ShortMemoryComparer.cs

@@ -15,14 +15,6 @@ public ShortMemoryComparer(ScanCompareType compareType, short value1, short valu
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}

ReClass.NET_Tests/MemoryScanner/Comparer/ByteMemoryComparerTest.cs

@@ -23,10 +23,6 @@ public void TestConstructor(ScanCompareType compareType, byte value1, byte value
 			Check.That(sut.ValueSize).IsEqualTo(sizeof(byte));
 			Check.That(sut.Value1).IsOneOf(value1, value2);
 			Check.That(sut.Value2).IsOneOf(value1, value2);
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				Check.That(sut.Value1 <= sut.Value2).IsTrue();
-			}
 		}
 
 		public static TheoryData<ScanCompareType, byte, byte, byte[], bool, ScanResult> GetTestCompareBasicData() => new TheoryData<ScanCompareType, byte, byte, byte[], bool, ScanResult>

ReClass.NET_Tests/MemoryScanner/Comparer/IntegerMemoryComparerTest.cs

@@ -23,10 +23,6 @@ public void TestConstructor(ScanCompareType compareType, int value1, int value2)
 			Check.That(sut.ValueSize).IsEqualTo(sizeof(int));
 			Check.That(sut.Value1).IsOneOf(value1, value2);
 			Check.That(sut.Value2).IsOneOf(value1, value2);
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				Check.That(sut.Value1 <= sut.Value2).IsTrue();
-			}
 		}
 
 		public static TheoryData<ScanCompareType, int, int, byte[], bool, ScanResult> GetTestCompareBasicData() => new TheoryData<ScanCompareType, int, int, byte[], bool, ScanResult>

ReClass.NET_Tests/MemoryScanner/Comparer/LongMemoryComparerTest.cs

@@ -23,10 +23,6 @@ public void TestConstructor(ScanCompareType compareType, long value1, long value
 			Check.That(sut.ValueSize).IsEqualTo(sizeof(long));
 			Check.That(sut.Value1).IsOneOf(value1, value2);
 			Check.That(sut.Value2).IsOneOf(value1, value2);
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				Check.That(sut.Value1 <= sut.Value2).IsTrue();
-			}
 		}
 
 		public static TheoryData<ScanCompareType, long, long, byte[], bool, ScanResult> GetTestCompareBasicData() => new TheoryData<ScanCompareType, long, long, byte[], bool, ScanResult>