Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -380,13 +380,14 @@ internal static ParsingStatus TryParseBinaryIntegerStyle<TChar, TInteger>(ReadOn
}
else
{
value = value.Slice(index);
index = 0;
// Slice a copy rather than reassigning value, so that index (and thus the number
// of elements reported as consumed) stays relative to the original input.
ReadOnlySpan<TChar> remaining = value.Slice(index);

ReadOnlySpan<TChar> positiveSign = info.PositiveSignTChar<TChar>();
ReadOnlySpan<TChar> negativeSign = info.NegativeSignTChar<TChar>();

if (!positiveSign.IsEmpty && value.StartsWith(positiveSign))
if (!positiveSign.IsEmpty && remaining.StartsWith(positiveSign))
{
index += positiveSign.Length;

Expand All @@ -396,7 +397,7 @@ internal static ParsingStatus TryParseBinaryIntegerStyle<TChar, TInteger>(ReadOn
}
num = TChar.CastToUInt32(value[index]);
}
else if (!negativeSign.IsEmpty && value.StartsWith(negativeSign))
else if (!negativeSign.IsEmpty && remaining.StartsWith(negativeSign))
{
isNegative = true;
index += negativeSign.Length;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,15 @@ public static IEnumerable<object[]> TryParsePartial_TestData()

// Stop at null character
yield return new object[] { "123\0abc", NumberStyles.Integer, null, 123, 4 };

// Leading whitespace is counted as consumed even when the signs aren't the invariant "+"/"-"
NumberFormatInfo nonInvariantSignFormat = new NumberFormatInfo() { NegativeSign = "\u2212" };
yield return new object[] { " 5", NumberStyles.Integer, nonInvariantSignFormat, 5, 2 };
yield return new object[] { " 123abc", NumberStyles.Integer, nonInvariantSignFormat, 123, 5 };
yield return new object[] { " +123abc", NumberStyles.Integer, nonInvariantSignFormat, 123, 6 };
yield return new object[] { " \u2212456xyz", NumberStyles.Integer, nonInvariantSignFormat, -456, 6 };
yield return new object[] { " \u2212456", NumberStyles.Integer, nonInvariantSignFormat, -456, 6 };
yield return new object[] { " 123 abc", NumberStyles.Integer, nonInvariantSignFormat, 123, 7 };
}

[Theory]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,12 @@ public static IEnumerable<object[]> TryParsePartial_TestData()

// Valid number without trailing characters
yield return new object[] { "123", NumberStyles.Integer, null, 123u, 3 };

// Leading whitespace is counted as consumed even when the signs aren't the invariant "+"/"-"
NumberFormatInfo nonInvariantSignFormat = new NumberFormatInfo() { NegativeSign = "\u2212" };
yield return new object[] { " 5", NumberStyles.Integer, nonInvariantSignFormat, 5u, 2 };
yield return new object[] { " 123abc", NumberStyles.Integer, nonInvariantSignFormat, 123u, 5 };
yield return new object[] { " +123abc", NumberStyles.Integer, nonInvariantSignFormat, 123u, 6 };
}

[Theory]
Expand Down
Loading