Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A fix for Scintilla's case insensitive sort routine

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-18 01:27:16 +00:00
parent b8b0e4022e
commit 30dbb45440
2 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
contrib/src/stc/scintilla/src/PropSet.cxx
View File

@@ -26,13 +26,23 @@ static inline char MakeUpperCase(char ch) {
return static_cast<char>(ch - 'a' + 'A'); return static_cast<char>(ch - 'a' + 'A');
} }
static inline bool IsLetter(char ch) {
return ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'));
}
int CompareCaseInsensitive(const char *a, const char *b) { int CompareCaseInsensitive(const char *a, const char *b) {
while (*a && *b) { while (*a && *b) {
if (*a != *b) { if (*a != *b) {
char upperA = MakeUpperCase(*a); if (IsLetter(*a) && IsLetter(*b)) {
char upperB = MakeUpperCase(*b); char upperA = MakeUpperCase(*a);
if (upperA != upperB) char upperB = MakeUpperCase(*b);
return upperA - upperB; if (upperA != upperB)
return upperA - upperB;
}
else {
return *a - *b;
}
} }
a++; a++;
b++; b++;
@@ -44,10 +54,15 @@ int CompareCaseInsensitive(const char *a, const char *b) {
int CompareNCaseInsensitive(const char *a, const char *b, int len) { int CompareNCaseInsensitive(const char *a, const char *b, int len) {
while (*a && *b && len) { while (*a && *b && len) {
if (*a != *b) { if (*a != *b) {
char upperA = MakeUpperCase(*a); if (IsLetter(*a) && IsLetter(*b)) {
char upperB = MakeUpperCase(*b); char upperA = MakeUpperCase(*a);
if (upperA != upperB) char upperB = MakeUpperCase(*b);
return upperA - upperB; if (upperA != upperB)
return upperA - upperB;
}
else {
return *a - *b;
}
} }
a++; a++;
b++; b++;

31
src/stc/scintilla/src/PropSet.cxx
View File

@@ -26,13 +26,23 @@ static inline char MakeUpperCase(char ch) {
return static_cast<char>(ch - 'a' + 'A'); return static_cast<char>(ch - 'a' + 'A');
} }
static inline bool IsLetter(char ch) {
return ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'));
}
int CompareCaseInsensitive(const char *a, const char *b) { int CompareCaseInsensitive(const char *a, const char *b) {
while (*a && *b) { while (*a && *b) {
if (*a != *b) { if (*a != *b) {
char upperA = MakeUpperCase(*a); if (IsLetter(*a) && IsLetter(*b)) {
char upperB = MakeUpperCase(*b); char upperA = MakeUpperCase(*a);
if (upperA != upperB) char upperB = MakeUpperCase(*b);
return upperA - upperB; if (upperA != upperB)
return upperA - upperB;
}
else {
return *a - *b;
}
} }
a++; a++;
b++; b++;
@@ -44,10 +54,15 @@ int CompareCaseInsensitive(const char *a, const char *b) {
int CompareNCaseInsensitive(const char *a, const char *b, int len) { int CompareNCaseInsensitive(const char *a, const char *b, int len) {
while (*a && *b && len) { while (*a && *b && len) {
if (*a != *b) { if (*a != *b) {
char upperA = MakeUpperCase(*a); if (IsLetter(*a) && IsLetter(*b)) {
char upperB = MakeUpperCase(*b); char upperA = MakeUpperCase(*a);
if (upperA != upperB) char upperB = MakeUpperCase(*b);
return upperA - upperB; if (upperA != upperB)
return upperA - upperB;
}
else {
return *a - *b;
}
} }
a++; a++;
b++; b++;