Skip to content

Fix TryParseBigIntegerHexOrBinaryNumberStyle #97995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 28, 2024
Merged

Fix TryParseBigIntegerHexOrBinaryNumberStyle #97995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09d00bd
Fix TryParseBigIntegerHexOrBinaryNumberStyle
kzrnm Feb 5, 2024
d206220
Fix typo
kzrnm Feb 5, 2024
1c1a104
Add hex test
kzrnm Feb 5, 2024
7184c0a
Merge branch 'main' into BigIntegerBinParse
tannergooding Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/libraries/System.Runtime.Numerics/src/System/Number.BigInteger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ internal static ParsingStatus TryParseBigIntegerHexOrBinaryNumberStyle<TParser,
int leadingBitsCount = value.Length % TParser.DigitsPerBlock;

uint leading = signBits;
// First parse unanligned leading block if exists.
// First parse unaligned leading block if exists.
if (leadingBitsCount != 0)
{
if (!TParser.TryParseUnalignedBlock(value[0..leadingBitsCount], out leading))
Expand Down Expand Up @@ -484,8 +484,8 @@ internal static ParsingStatus TryParseBigIntegerHexOrBinaryNumberStyle<TParser,
// Require to store in _bits.

// Positive: sign=1, bits=[leading]
// Negative: sign=-1, bits=[leading ^ -1 + 1]=[-leading]
result = new BigInteger((int)signBits | 1, [leading ^ signBits - signBits]);
// Negative: sign=-1, bits=[(leading ^ -1) + 1]=[-leading]
result = new BigInteger((int)signBits | 1, [(leading ^ signBits) - signBits]);
return ParsingStatus.OK;
}
else
Expand Down
13 changes: 13 additions & 0 deletions src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,18 @@ public void Parse_Hex32Bits()
Assert.True(BigInteger.TryParse("080000001", NumberStyles.HexNumber, null, out result));
Assert.Equal(0x80000001u, result);

Assert.True(BigInteger.TryParse("F0000001", NumberStyles.HexNumber, null, out result));
Assert.Equal(-0xFFFFFFFL, result);

Assert.True(BigInteger.TryParse("0F0000001", NumberStyles.HexNumber, null, out result));
Assert.Equal(0xF0000001u, result);

Assert.True(BigInteger.TryParse("F00000001", NumberStyles.HexNumber, null, out result));
Assert.Equal(-0xFFFFFFFFL, result);

Assert.True(BigInteger.TryParse("0F00000001", NumberStyles.HexNumber, null, out result));
Assert.Equal(0xF00000001u, result);

// Regression test for: https://github.com/dotnet/runtime/issues/74758
Assert.True(BigInteger.TryParse("FFFFFFFFE", NumberStyles.HexNumber, null, out result));
Assert.Equal(new BigInteger(-2), result);
Expand Down Expand Up @@ -175,6 +187,7 @@ public void Parse_Hex32Bits()
[InlineData("10000000000000000000000000000000", (long)int.MinValue)]
[InlineData("010000000000000000000000000000001", 0x080000001L)]
[InlineData("111111111111111111111111111111110", -2L)]
[InlineData("100000000000000000000000000000001", -0xFFFFFFFFL)]
[InlineData("0111111111111111111111111111111111", 0x1FFFFFFFFL)]
public void Parse_BinSpecialCases(string input, long expectedValue)
{
Expand Down