Skip to content

A Swiss Army knife for developers.

Fixed negative number base converter (#213)

BenjaminT5ab8653f0858
diff --git a/src/dev/impl/DevToys/Helpers/NumberBaseHelper.cs b/src/dev/impl/DevToys/Helpers/NumberBaseHelper.cs
index d4c1b32ae..e9cf05fad 100644
--- a/src/dev/impl/DevToys/Helpers/NumberBaseHelper.cs
+++ b/src/dev/impl/DevToys/Helpers/NumberBaseHelper.cs
@@ -1,7 +1,6 @@
#nullable enable
using System.Globalization;
-using DevToys.Core.Formatter;
namespace DevToys.Helpers
{
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolProvider.cs b/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolProvider.cs
index 39347570a..c19c56175 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolProvider.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolProvider.cs
@@ -2,10 +2,10 @@
using System.Composition;
using DevToys.Api.Tools;
-using DevToys.Core.Formatter;
using DevToys.Core.Threading;
using DevToys.Helpers;
using DevToys.Shared.Api.Core;
+using DevToys.ViewModels.Tools.Converters.NumberBaseConverter;
using Windows.UI.Xaml.Controls;
namespace DevToys.ViewModels.Tools.NumberBaseConverter
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolViewModel.cs
index 89d63b100..b8223414a 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolViewModel.cs
@@ -10,10 +10,10 @@ using DevToys.Api.Core;
using DevToys.Api.Core.Settings;
using DevToys.Api.Tools;
using DevToys.Core;
-using DevToys.Core.Formatter;
using DevToys.Core.Threading;
using DevToys.Models;
using DevToys.Shared.Core.Threading;
+using DevToys.ViewModels.Tools.Converters.NumberBaseConverter;
using DevToys.Views.Tools.NumberBaseConverter;
using Microsoft.Toolkit.Mvvm.ComponentModel;
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseFormatter.cs b/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseFormatter.cs
index c465585d8..8cf5f3a0e 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseFormatter.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Converters/NumberBaseConverter/NumberBaseFormatter.cs
@@ -5,7 +5,7 @@ using System.Globalization;
using System.Text;
using DevToys.Models;
-namespace DevToys.Core.Formatter
+namespace DevToys.ViewModels.Tools.Converters.NumberBaseConverter
{
internal static class NumberBaseFormatter
{
@@ -70,7 +70,7 @@ namespace DevToys.Core.Formatter
Span<char> buffer = stackalloc char[67]; // Longest possible string length for an integer in binary notation with prefix
// If the number is negative, make it positive and remember the sign.
- long ul;
+ ulong ul;
bool isNegative = false;
if (number < 0)
{
@@ -78,11 +78,11 @@ namespace DevToys.Core.Formatter
// For base 10, write out -num, but other bases write out the
// 2's complement bit pattern
- ul = (10 == baseNumber.BaseNumber) ? -number : number;
+ ul = baseNumber == NumberBaseFormat.Decimal ? (ulong)-number : (ulong)number;
}
else
{
- ul = number;
+ ul = (ulong)number;
}
// Special case the 0.
@@ -95,13 +95,13 @@ namespace DevToys.Core.Formatter
else
{
index = 0;
- for (int i = 0; i < buffer.Length; i++) // for loop instead of do{...}while(l!=0) to help JIT eliminate span bounds checks
+ for (int i = 0; i < buffer.Length; i++)
{
- long div = ul / baseNumber.BaseNumber; // TODO https://github.com/dotnet/runtime/issues/5213
- int charVal = (int)(ul - (div * baseNumber.BaseNumber));
+ ulong div = ul / (ulong)baseNumber.BaseNumber;
+ int charVal = (int)(ul - div * (ulong)baseNumber.BaseNumber);
ul = div;
- buffer[i] = (charVal < 10) ?
+ buffer[i] = charVal < 10 ?
(char)(charVal + '0') :
(char)(charVal + 'a' - 10);
@@ -191,7 +191,23 @@ namespace DevToys.Core.Formatter
private static long GetLong(NumberBaseFormat baseNumber, ReadOnlySpan<char> spanValue, int index, int length)
{
ulong result = 0;
- ulong maxVal = 0x7FFFFFFFFFFFFFFF / 10;
+ ulong maxVal;
+ if (baseNumber == NumberBaseFormat.Binary)
+ {
+ maxVal = 0xffffffffffffffff / 2;
+ }
+ else if (baseNumber == NumberBaseFormat.Octal)
+ {
+ maxVal = 0xffffffffffffffff / 8;
+ }
+ else if (baseNumber == NumberBaseFormat.Hexadecimal)
+ {
+ maxVal = 0xffffffffffffffff / 16;
+ }
+ else
+ {
+ maxVal = 0x7FFFFFFFFFFFFFFF / 10;
+ }
// Read all of the digits and convert to a number
while (index < length)
@@ -258,9 +274,9 @@ namespace DevToys.Core.Formatter
case Radix.Octal:
return char.IsNumber(c);
case Radix.Hexdecimal:
- return (char.IsNumber(c) ||
- (c >= 'a' && c <= 'f') ||
- (c >= 'A' && c <= 'F'));
+ return char.IsNumber(c) ||
+ c >= 'a' && c <= 'f' ||
+ c >= 'A' && c <= 'F';
default:
return true;
}
diff --git a/src/dev/impl/DevToys/Views/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs b/src/dev/impl/DevToys/Views/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs
index d3e899371..041d59ab2 100644
--- a/src/dev/impl/DevToys/Views/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs
+++ b/src/dev/impl/DevToys/Views/Tools/Converters/NumberBaseConverter/NumberBaseConverterToolPage.xaml.cs
@@ -1,10 +1,10 @@
#nullable enable
using DevToys.Api.Core.Navigation;
-using DevToys.Core.Formatter;
using DevToys.Helpers;
using DevToys.Models;
using DevToys.Shared.Core;
+using DevToys.ViewModels.Tools.Converters.NumberBaseConverter;
using DevToys.ViewModels.Tools.NumberBaseConverter;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
diff --git a/src/tests/DevToys.Tests/DevToys.Tests.csproj b/src/tests/DevToys.Tests/DevToys.Tests.csproj
index 2c36a509a..352c8e93c 100644
--- a/src/tests/DevToys.Tests/DevToys.Tests.csproj
+++ b/src/tests/DevToys.Tests/DevToys.Tests.csproj
@@ -44,7 +44,7 @@
<SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Core\Formatter\BaseNumberFormatterTests.cs" />
+ <Compile Include="Providers\Tools\BaseNumberFormatterTests.cs" />
<Compile Include="Core\Threading\AsyncLazyTests.cs" />
<Compile Include="Core\Threading\TaskCompletionNotifierTests.cs" />
<Compile Include="Helpers\YamlHelperTests.cs" />
diff --git a/src/tests/DevToys.Tests/Core/Formatter/BaseNumberFormatterTests.cs b/src/tests/DevToys.Tests/Providers/Tools/BaseNumberFormatterTests.cs
similarity index 75%
rename from src/tests/DevToys.Tests/Core/Formatter/BaseNumberFormatterTests.cs
rename to src/tests/DevToys.Tests/Providers/Tools/BaseNumberFormatterTests.cs
index dc2ee3488..200040923 100644
--- a/src/tests/DevToys.Tests/Core/Formatter/BaseNumberFormatterTests.cs
+++ b/src/tests/DevToys.Tests/Providers/Tools/BaseNumberFormatterTests.cs
@@ -1,11 +1,11 @@
using System;
using System.Globalization;
using System.Threading;
-using DevToys.Core.Formatter;
using DevToys.Models;
+using DevToys.ViewModels.Tools.Converters.NumberBaseConverter;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-namespace DevToys.Tests.Core.Formatter
+namespace DevToys.Tests.Providers.Tools
{
[TestClass]
public class BaseNumberFormatterTests
@@ -18,6 +18,8 @@ namespace DevToys.Tests.Core.Formatter
[DataRow("C6AEA155", 3333333333)]
[DataRow("C6AE A155", 3333333333)]
[DataRow("C6AE A15 5", 3333333333)]
+ [DataRow("FFFF FFFF FFFF FFF6", -10)]
+ [DataRow("FFFFFFFFFFFFFFF6", -10)]
public void HexadecimalToDecimal(string input, long expectedResult)
{
Assert.AreEqual(expectedResult, NumberBaseFormatter.StringToBase(input, NumberBaseFormat.Hexadecimal));
@@ -37,6 +39,8 @@ namespace DevToys.Tests.Core.Formatter
[DataTestMethod]
[DataRow("30653520525", 3333333333)]
[DataRow("30 653 520 525", 3333333333)]
+ [DataRow("1777777777747124257253", -3333333333)]
+ [DataRow("1 777 777 777 747 124 257 253", -3333333333)]
public void OctalToDecimal(string input, long expectedResult)
{
Assert.AreEqual(expectedResult, NumberBaseFormatter.StringToBase(input, NumberBaseFormat.Octal));
@@ -58,6 +62,8 @@ namespace DevToys.Tests.Core.Formatter
[DataRow("0001 0100 1101", 333)]
[DataRow("11000110101011101010000101010101", 3333333333)]
[DataRow("1100 0110 1010 1110 1010 0001 0101 0101", 3333333333)]
+ [DataRow("1111111111111111111111111111111100111001010100010101111010101011", -3333333333)]
+ [DataRow("1111 1111 1111 1111 1111 1111 1111 1111 0011 1001 0101 0001 0101 1110 1010 1011", -3333333333)]
public void BinaryToDecimal(string input, long expectedResult)
{
Assert.AreEqual(expectedResult, NumberBaseFormatter.StringToBase(input, NumberBaseFormat.Binary));
@@ -75,26 +81,30 @@ namespace DevToys.Tests.Core.Formatter
}
[DataTestMethod]
- [DataRow(3333333333, "C6AEA155", false)]
- [DataRow(3333333333, "C6AE A155", true)]
+ [DataRow(18006427676, "43144481C", false)]
+ [DataRow(18006427676, "4 3144 481C", true)]
+ [DataRow(-18006427676, "FFFFFFFBCEBBB7E4", false)]
+ [DataRow(-18006427676, "FFFF FFFB CEBB B7E4", true)]
public void DecimalToHexadecimal(long input, string expectedResult, bool isFormatted)
{
Assert.AreEqual(expectedResult, NumberBaseFormatter.LongToBase(input, NumberBaseFormat.Hexadecimal, isFormatted));
}
[DataTestMethod]
- [DataRow(3333333333, "30653520525", false)]
- [DataRow(3333333333, "30 653 520 525", true)]
+ [DataRow(18006427676, "206121044034", false)]
+ [DataRow(18006427676, "206 121 044 034", true)]
+ [DataRow(-18006427676, "1777777777571656733744", false)]
+ [DataRow(-18006427676, "1 777 777 777 571 656 733 744", true)]
public void DecimalToOctal(long input, string expectedResult, bool isFormatted)
{
Assert.AreEqual(expectedResult, NumberBaseFormatter.LongToBase(input, NumberBaseFormat.Octal, isFormatted));
}
[DataTestMethod]
- [DataRow(333, "000101001101", false)]
- [DataRow(333, "0001 0100 1101", true)]
- [DataRow(3333333333, "11000110101011101010000101010101", false)]
- [DataRow(3333333333, "1100 0110 1010 1110 1010 0001 0101 0101", true)]
+ [DataRow(18006427676, "010000110001010001000100100000011100", false)]
+ [DataRow(18006427676, "0100 0011 0001 0100 0100 0100 1000 0001 1100", true)]
+ [DataRow(-18006427676, "1111111111111111111111111111101111001110101110111011011111100100", false)]
+ [DataRow(-18006427676, "1111 1111 1111 1111 1111 1111 1111 1011 1100 1110 1011 1011 1011 0111 1110 0100", true)]
public void DecimalToBinary(long input, string expectedResult, bool isFormatted)
{
Assert.AreEqual(expectedResult, NumberBaseFormatter.LongToBase(input, NumberBaseFormat.Binary, isFormatted));