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

Bug 1591490 - Use the NS_IS_SURROGATE_PAIR macro everywhere. r=Ehsan

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D50697
This commit is contained in:
Alex Henrie
2019-10-27 05:05:51 +00:00
parent 43a7e0e46c
commit fd5feb4ae7
21 changed files with 43 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intl/unicharutil/util/nsUnicodeProperties.cpp
View File

@@ -184,7 +184,7 @@ void ClusterIterator::Next() {
uint32_t ch = *mPos++;
if (NS_IS_HIGH_SURROGATE(ch) && mPos < mLimit && NS_IS_LOW_SURROGATE(*mPos)) {
if (mPos < mLimit && NS_IS_SURROGATE_PAIR(ch, *mPos)) {
ch = SURROGATE_TO_UCS4(ch, *mPos++);
} else if ((ch & ~0xff) == 0x1100 || (ch >= 0xa960 && ch <= 0xa97f) ||
(ch >= 0xac00 && ch <= 0xd7ff)) {
@@ -247,8 +247,7 @@ void ClusterIterator::Next() {
// Check for surrogate pairs; note that isolated surrogates will just
// be treated as generic (non-cluster-extending) characters here,
// which is fine for cluster-iterating purposes
if (NS_IS_HIGH_SURROGATE(ch) && mPos < mLimit - 1 &&
NS_IS_LOW_SURROGATE(*(mPos + 1))) {
if (mPos < mLimit - 1 && NS_IS_SURROGATE_PAIR(ch, *(mPos + 1))) {
ch = SURROGATE_TO_UCS4(ch, *(mPos + 1));
chLen = 2;
}
@@ -281,8 +280,7 @@ void ClusterReverseIterator::Next() {
do {
ch = *--mPos;
if (NS_IS_LOW_SURROGATE(ch) && mPos > mLimit &&
NS_IS_HIGH_SURROGATE(*(mPos - 1))) {
if (mPos > mLimit && NS_IS_SURROGATE_PAIR(*(mPos - 1), ch)) {
ch = SURROGATE_TO_UCS4(*--mPos, ch);
}