organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-96 Removed RuleBasedCollator::getUnicodeOrder().

Browse source 
X-SVN-Rev: 372
This commit is contained in:
Helena Chapman 1999-12-10 18:53:45 +00:00
parent fb9d6d6e04
commit 80bf06949d
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4c/source/i18n/coleitr.cpp
View file

@ -27,6 +27,9 @@
#include "tables.h"
#include "normlzr.h"
#include "unicode.h"
#include "tcoldata.h"
#include "ucmp32.h"
int32_t const CollationElementIterator::NULLORDER = 0xffffffff;
int32_t const CollationElementIterator::UNMAPPEDCHARVALUE = 0x7fff0000;
@ -333,7 +336,9 @@ CollationElementIterator::next(UErrorCode& status)
}
// Ask the collator for this character's ordering.
int32_t value = orderAlias->getUnicodeOrder(ch);
/* Used to be RuleBasedCollator.getUnicodeOrder(). It
can't be inlined in tblcoll.h file unfortunately. */
int32_t value = ucmp32_get(orderAlias->data->mapping, ch);
if (value == RuleBasedCollator::UNMAPPED)
{
@ -399,8 +404,9 @@ CollationElementIterator::previous(UErrorCode& status)
{
return NULLORDER;
}
int32_t value = orderAlias->getUnicodeOrder(ch);
/* Used to be RuleBasedCollator.getUnicodeOrder(). It
can't be inlined in tblcoll.h file unfortunately. */
int32_t value = ucmp32_get(orderAlias->data->mapping, ch);
if (value == RuleBasedCollator::UNMAPPED)
{

9
icu4c/source/i18n/tblcoll.cpp
View file

@ -136,13 +136,6 @@ char RuleBasedCollator::fgClassID = 0; // Value is irrelevant // class id
//================ Some inline definitions of implementation functions........ ========
// Get the character order in the mapping table
inline int32_t
RuleBasedCollator::getUnicodeOrder(UChar ch) const
{
return ucmp32_get(data->mapping, ch);
}
inline int32_t
RuleBasedCollator::strengthOrder(int32_t value) const
{
@ -211,7 +204,7 @@ RuleBasedCollator::getStrengthOrder(NormalizerIterator* cursor,
return CollationElementIterator::NULLORDER;
}
// Ask the collator for this character's ordering.
int32_t value = getUnicodeOrder(ch);
int32_t value = ucmp32_get(data->mapping, ch);
if (value == UNMAPPED)
{

6
icu4c/source/i18n/tblcoll.h
View file

@ -656,12 +656,6 @@ private:
* the list.
*/
VectorOfInt* getExpandValueList(int32_t order) const;
/**
* Gets the comarison order of a character from the collation table.
* @param ch the Unicode character
* @return the comparison order of a character.
*/
int32_t getUnicodeOrder(UChar ch) const;
/**
* Gets the comarison order of a character from the collation table.

1
icu4c/source/i18n/tcoldata.h
View file

@ -115,6 +115,7 @@ private:
* to change, although this is not really advised.
*/
friend class RuleBasedCollator;
friend class CollationElementIterator;
bool_t isFrenchSec;
int16_t maxSecOrder;