corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 366592 - "Add comparison operators to external string API". r=bsmedberg.

Browse Source
This commit is contained in:
bent.mozilla@gmail.com
2007-01-17 21:10:02 +00:00
parent 420226fc02
commit 25e9c36c1b
3 changed files with 530 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
xpcom/glue/nsStringAPI.cpp
View File

@@ -21,6 +21,7 @@
* Contributor(s):
* Darin Fisher <darin@meer.net>
* Benjamin Smedberg <benjamin@smedbergs.us>
* Ben Turner <mozilla@songbirdnest.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -230,12 +231,48 @@ nsAString::DefaultComparator(const char_type *a, const char_type *b,
if (*a == *b)
continue;
return a < b ? -1 : 1;
return *a < *b ? -1 : 1;
}
return 0;
}
PRInt32
nsAString::Compare(const char_type *other, ComparatorFunc c) const
{
const char_type *cself;
PRUint32 selflen = NS_StringGetData(*this, &cself);
PRUint32 otherlen = NS_strlen(other);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, other, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
else if (selflen > otherlen)
return 1;
}
return result;
}
PRInt32
nsAString::Compare(const self_type &other, ComparatorFunc c) const
{
const char_type *cself, *cother;
PRUint32 selflen = NS_StringGetData(*this, &cself);
PRUint32 otherlen = NS_StringGetData(other, &cother);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, cother, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
else if (selflen > otherlen)
return 1;
}
return result;
}
PRBool
nsAString::Equals(const char_type *other, ComparatorFunc c) const
{
@@ -617,6 +654,42 @@ nsACString::DefaultComparator(const char_type *a, const char_type *b,
return memcmp(a, b, len);
}
PRInt32
nsACString::Compare(const char_type *other, ComparatorFunc c) const
{
const char_type *cself;
PRUint32 selflen = NS_CStringGetData(*this, &cself);
PRUint32 otherlen = strlen(other);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, other, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
else if (selflen > otherlen)
return 1;
}
return result;
}
PRInt32
nsACString::Compare(const self_type &other, ComparatorFunc c) const
{
const char_type *cself, *cother;
PRUint32 selflen = NS_CStringGetData(*this, &cself);
PRUint32 otherlen = NS_CStringGetData(other, &cother);
PRUint32 comparelen = selflen <= otherlen ? selflen : otherlen;
PRInt32 result = c(cself, cother, comparelen);
if (result == 0) {
if (selflen < otherlen)
return -1;
else if (selflen > otherlen)
return 1;
}
return result;
}
PRBool
nsACString::Equals(const char_type *other, ComparatorFunc c) const
{