dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-21 02:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor: reduce redundant code in NumericSort.Compare()

Browse source 
* Refactor the 2 do-loops into simpler while-loops and replace the use of "tmp1/2" char-arrays with calls to String.Substring().
* Rename the "loc1/2" variables to "subLen1/2", for clarity, since they represent the lengths of the two extracted Substrings.

These changes make the logic more compact and easier to follow.
This commit is contained in:
Göran W 2025-06-13 10:42:04 +02:00
parent 99b7208a54
commit 72a748f748
1 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/Models/NumericSort.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using Avalonia.Media;
namespace SourceGit.Models namespace SourceGit.Models
{ {
@ -12,50 +13,33 @@ namespace SourceGit.Models
int marker1 = 0; int marker1 = 0;
int marker2 = 0; int marker2 = 0;
char[] tmp1 = new char[len1];
char[] tmp2 = new char[len2];
while (marker1 < len1 && marker2 < len2) while (marker1 < len1 && marker2 < len2)
{ {
char c1 = s1[marker1]; char c1 = s1[marker1];
char c2 = s2[marker2]; char c2 = s2[marker2];
int loc1 = 0;
int loc2 = 0;
bool isDigit1 = char.IsDigit(c1); bool isDigit1 = char.IsDigit(c1);
bool isDigit2 = char.IsDigit(c2); bool isDigit2 = char.IsDigit(c2);
if (isDigit1 != isDigit2) if (isDigit1 != isDigit2)
return c1.CompareTo(c2); return c1.CompareTo(c2);
do int subLen1 = 1;
{ while (marker1 + subLen1 < len1 && char.IsDigit(s1[marker1 + subLen1]) == isDigit1)
tmp1[loc1] = c1; subLen1++;
loc1++;
marker1++;
if (marker1 < len1) int subLen2 = 1;
c1 = s1[marker1]; while (marker2 + subLen2 < len2 && char.IsDigit(s2[marker2 + subLen2]) == isDigit2)
else subLen2++;
break;
} while (char.IsDigit(c1) == isDigit1);
do string sub1 = s1.Substring(marker1, subLen1);
{ string sub2 = s2.Substring(marker2, subLen2);
tmp2[loc2] = c2;
loc2++;
marker2++;
if (marker2 < len2) marker1 += subLen1;
c2 = s2[marker2]; marker2 += subLen2;
else
break;
} while (char.IsDigit(c2) == isDigit2);
string sub1 = new string(tmp1, 0, loc1);
string sub2 = new string(tmp2, 0, loc2);
int result; int result;
if (isDigit1) if (isDigit1)
result = loc1 == loc2 ? string.CompareOrdinal(sub1, sub2) : loc1 - loc2; result = (subLen1 == subLen2) ? string.CompareOrdinal(sub1, sub2) : (subLen1 - subLen2);
else else
result = string.Compare(sub1, sub2, StringComparison.OrdinalIgnoreCase); result = string.Compare(sub1, sub2, StringComparison.OrdinalIgnoreCase);