claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NaturalComparer] Use modern code

Browse Source
This commit is contained in:
Matt Nadareski
2017-06-16 17:05:48 -07:00
parent fe574541c7
commit ef1a242d93
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs vendored
View File

@@ -39,14 +39,13 @@ namespace NaturalSort
{
return y.CompareTo(x);
}
string[] x1, y1;
if (!table.TryGetValue(x, out x1))
if (!table.TryGetValue(x, out string[] x1))
{
//x1 = Regex.Split(x.Replace(" ", ""), "([0-9]+)");
x1 = Regex.Split(x.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray();
table.Add(x, x1);
}
if (!table.TryGetValue(y, out y1))
if (!table.TryGetValue(y, out string[] y1))
{
//y1 = Regex.Split(y.Replace(" ", ""), "([0-9]+)");
y1 = Regex.Split(y.ToLowerInvariant(), "([0-9]+)").Where(s => s != "").ToArray();
@@ -76,13 +75,12 @@ namespace NaturalSort
private static int PartCompare(string left, string right)
{
long x, y;
if (!long.TryParse(left, out x))
if (!long.TryParse(left, out long x))
{
return Style.CompareNumeric(right, left);
}
if (!long.TryParse(right, out y))
if (!long.TryParse(right, out long y))
{
return Style.CompareNumeric(right, left);
}