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

Bug 898984 - Part 1: Add ClusterReverseIterator in nsUnicodeProperties. r=jfkthame

Browse Source
This commit is contained in:
Xidorn Quan
2013-08-11 03:37:00 +09:00
parent 2ee9559754
commit f7974294b8
2 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* This Source Code Form is subject to the terms of the Mozilla Public
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* vim:set ts=4 sw=4 sts=4 et cindent: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -503,6 +504,34 @@ ClusterIterator::Next()
"ClusterIterator::Next has overshot the string!");
}
void
ClusterReverseIterator::Next()
{
if (AtEnd()) {
NS_WARNING("ClusterReverseIterator has already reached the end");
return;
}
uint32_t ch;
do {
ch = *--mPos;
if (NS_IS_LOW_SURROGATE(ch) && mPos > mLimit &&
NS_IS_HIGH_SURROGATE(*(mPos - 1))) {
ch = SURROGATE_TO_UCS4(*--mPos, ch);
}
if (!IsClusterExtender(ch)) {
break;
}
} while (mPos > mLimit);
// XXX May need to handle conjoining Jamo
NS_ASSERTION(mPos >= mLimit,
"ClusterReverseIterator::Next has overshot the string!");
}
uint32_t
CountGraphemeClusters(const char16_t* aText, uint32_t aLength)
{