OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply Godfrey's patch (originally in r5872) to Shared/LSL_Types.cs as well.

0.6.0-stable
Mike Mazur 2008-08-19 05:25:07 +00:00
parent bea7d4d81a
commit a513cba60b
1 changed files with 94 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@ -629,6 +629,98 @@ namespace OpenSim.Region.ScriptEngine.Shared
}
}
private class AlphanumComparatorFast : IComparer
{
public int Compare(object x, object y)
{
string s1 = x as string;
if (s1 == null)
{
return 0;
}
string s2 = y as string;
if (s2 == null)
{
return 0;
}
int len1 = s1.Length;
int len2 = s2.Length;
int marker1 = 0;
int marker2 = 0;
// Walk through two the strings with two markers.
while (marker1 < len1 && marker2 < len2)
{
char ch1 = s1[marker1];
char ch2 = s2[marker2];
// Some buffers we can build up characters in for each chunk.
char[] space1 = new char[len1];
int loc1 = 0;
char[] space2 = new char[len2];
int loc2 = 0;
// Walk through all following characters that are digits or
// characters in BOTH strings starting at the appropriate marker.
// Collect char arrays.
do
{
space1[loc1++] = ch1;
marker1++;
if (marker1 < len1)
{
ch1 = s1[marker1];
}
else
{
break;
}
} while (char.IsDigit(ch1) == char.IsDigit(space1[0]));
do
{
space2[loc2++] = ch2;
marker2++;
if (marker2 < len2)
{
ch2 = s2[marker2];
}
else
{
break;
}
} while (char.IsDigit(ch2) == char.IsDigit(space2[0]));
// If we have collected numbers, compare them numerically.
// Otherwise, if we have strings, compare them alphabetically.
string str1 = new string(space1);
string str2 = new string(space2);
int result;
if (char.IsDigit(space1[0]) && char.IsDigit(space2[0]))
{
int thisNumericChunk = int.Parse(str1);
int thatNumericChunk = int.Parse(str2);
result = thisNumericChunk.CompareTo(thatNumericChunk);
}
else
{
result = str1.CompareTo(str2);
}
if (result != 0)
{
return result;
}
}
return len1 - len2;
}
}
public list Sort(int stride, int ascending)
{
if (Data.Length == 0)
@ -647,7 +739,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
for (int k = 0; k < Data.Length; k++)
keys[k] = Data[k].ToString();
Array.Sort(keys, ret);
Array.Sort( keys, ret, new AlphanumComparatorFast() );
if (ascending == 0)
Array.Reverse(ret);
@ -683,7 +775,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
vals[idx]=o;
}
Array.Sort(keys, vals);
Array.Sort(keys, vals, new AlphanumComparatorFast());
if (ascending == 0)
{
Array.Reverse(vals);