Skip to content

Fixed parsing of NaN. #540

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

Closed
wants to merge 1 commit into from
Closed

Fixed parsing of NaN. #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion UnitsNet.Tests/CustomCode/ParseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class ParseTests
[InlineData("1e-3 km", 1)]
[InlineData("5.5 m", 5.5)]
[InlineData("500,005 m", 500005)]
[InlineData("NaN m", double.NaN)]
public void ParseLengthToMetersUsEnglish(string s, double expected)
{
CultureInfo usEnglish = new CultureInfo("en-US");
Expand Down Expand Up @@ -235,4 +236,4 @@ private static string AssertExceptionAndGetFullTypeName(Action code)
}

}
}
}
2 changes: 1 addition & 1 deletion UnitsNet/CustomCode/QuantityParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ internal static TQuantity Parse<TQuantity, TUnitType>([NotNull] string str,

string unitsRegex = $"({String.Join("|", unitAbbreviations)})";

string regexString = string.Format(@"(?:\s*(?<value>[-+]?{0}{1}{2}{3})?{4}{5}",
string regexString = string.Format(@"(?:\s*(?<value>(?:[-+]?{0}{1}|NaN){2}{3})?{4}{5}",
numRegex, // capture base (integral) Quantity value
exponentialRegex, // capture exponential (if any), end of Quantity capturing
@"\s?", // ignore whitespace (allows both "1kg", "1 kg")
Expand Down