From ef1a242d936fbb18f8e1a09a874d0b0fe68f0525 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 16 Jun 2017 17:05:48 -0700 Subject: [PATCH] [NaturalComparer] Use modern code --- .../External/NaturalSort/NaturalComparer.cs | 10 ++++------ .../External/NaturalSort/NaturalReversedComparer.cs | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs index 2fe734c7..94028786 100644 --- a/SabreTools.Library/External/NaturalSort/NaturalComparer.cs +++ b/SabreTools.Library/External/NaturalSort/NaturalComparer.cs @@ -39,14 +39,13 @@ namespace NaturalSort { return x.CompareTo(y); } - 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(left, right); } - if (!long.TryParse(right, out y)) + if (!long.TryParse(right, out long y)) { return Style.CompareNumeric(left, right); } diff --git a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs index cfb4f7b0..0884c84f 100644 --- a/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs +++ b/SabreTools.Library/External/NaturalSort/NaturalReversedComparer.cs @@ -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); }