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

ICU-1749 hide public data members; remove abbreviation API

Browse source 
X-SVN-Rev: 8547
This commit is contained in:
Alan Liu 2002-04-30 22:12:01 +00:00
parent 6b058615b7
commit e2b72f9b58
2 changed files with 65 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
icu4c/source/i18n/unicode/usetiter.h
View file

@ -4,7 +4,7 @@
* Corporation and others. All Rights Reserved.
**********************************************************************
* $Source: /xsrl/Nsvn/icu/icu/source/i18n/unicode/Attic/usetiter.h,v $
* $Revision: 1.3 $
* $Revision: 1.4 $
**********************************************************************
*/
#ifndef USETITER_H
@ -27,10 +27,10 @@ class UnicodeString;
* <pre>
* UnicodeSetIterator it(set);
* while (set.next()) {
* if (set.codepoint != UnicodeSetIterator::IS_STRING) {
* processCodepoint(set.codepoint);
* if (set.isString()) {
* processString(set.getString());
* } else {
* processString(set.string);
* processCodepoint(set.getCodepoint());
* }
* }
* </pre>
@ -39,10 +39,10 @@ class UnicodeString;
* <pre>
* UnicodeSetIterator it(set);
* while (set.nextRange()) {
* if (set.codepoint != UnicodeSetIterator::IS_STRING) {
* processCodepointRange(set.codepoint, set.codepointEnd);
* if (set.isString()) {
* processString(set.getString());
* } else {
* processString(set.string);
* processCodepointRange(set.getCodepoint(), set.getCodepointEnd());
* }
* }
* </pre>
@ -51,7 +51,7 @@ class UnicodeString;
*/
class U_I18N_API UnicodeSetIterator {
public:
protected:
/**
* Value of <tt>codepoint</tt> if the iterator points to a string.
@ -83,6 +83,8 @@ class U_I18N_API UnicodeSetIterator {
*/
const UnicodeString* string;
public:
/**
* Create an iterator over the given set. The iterator is valid
* only so long as <tt>set</tt> is valid.
@ -100,7 +102,37 @@ class U_I18N_API UnicodeSetIterator {
/**
* Destructor.
*/
~UnicodeSetIterator();
virtual ~UnicodeSetIterator();
/**
* Returns true if the current element is a string. If so, the
* caller can retrieve it with <tt>getString()</tt>. If this
* method returns false, the current element is a code point or
* code point range, depending on whether <tt>next()</tt> or
* <tt>nextRange()</tt> was called, and the caller can retrieve it
* with <tt>getCodepoint()</tt> and, for a range,
* <tt>getCodepointEnd()</tt>.
*/
inline UBool UnicodeSetIterator::isString() const;
/**
* Returns the current code point, if <tt>isString()</tt> returned
* false. Otherwise returns an undefined result.
*/
inline UChar32 UnicodeSetIterator::getCodepoint() const;
/**
* Returns the end of the current code point range, if
* <tt>isString()</tt> returned false and <tt>nextRange()</tt> was
* called. Otherwise returns an undefined result.
*/
inline UChar32 UnicodeSetIterator::getCodepointEnd() const;
/**
* Returns the current string, if <tt>isString()</tt> returned
* true. Otherwise returns an undefined result.
*/
inline const UnicodeString& UnicodeSetIterator::getString() const;
/**
* Returns the next element in the set, either a single code point
@ -156,21 +188,9 @@ class U_I18N_API UnicodeSetIterator {
*/
void reset();
/**
* INTERNAL: Causes the interation to only visit part of long ranges
* @internal used only for testing
*/
void setAbbreviated(UBool abbr);
/**
* INTERNAL: Causes the interation to only visit part of long ranges
* @internal used only for testing
*/
UBool getAbbreviated();
// ======================= PRIVATES ===========================
private:
protected:
// endElement and nextElements are really UChar32's, but we keep
// them as signed int32_t's so we can do comparisons with
@ -180,17 +200,33 @@ class U_I18N_API UnicodeSetIterator {
int32_t range;
int32_t endElement;
int32_t nextElement;
UBool abbreviated;
//UBool abbreviated;
int32_t nextString;
int32_t stringCount;
void loadRange(int32_t range);
UnicodeSetIterator(const UnicodeSetIterator&); // disallow
UnicodeSetIterator& operator=(const UnicodeSetIterator&); // disallow
virtual void loadRange(int32_t range);
};
inline UBool UnicodeSetIterator::isString() const {
return codepoint == IS_STRING;
}
inline UChar32 UnicodeSetIterator::getCodepoint() const {
return codepoint;
}
inline UChar32 UnicodeSetIterator::getCodepointEnd() const {
return codepointEnd;
}
inline const UnicodeString& UnicodeSetIterator::getString() const {
return *string;
}
U_NAMESPACE_END
#endif

31
icu4c/source/i18n/usetiter.cpp
View file

@ -4,8 +4,8 @@
* Corporation and others. All Rights Reserved.
**********************************************************************
* $Source: /xsrl/Nsvn/icu/icu/source/i18n/Attic/usetiter.cpp,v $
* $Date: 2002/04/25 23:35:30 $
* $Revision: 1.1 $
* $Date: 2002/04/30 22:11:47 $
* $Revision: 1.2 $
**********************************************************************
*/
#include "unicode/usetiter.h"
@ -19,18 +19,14 @@ U_NAMESPACE_BEGIN
* Create an iterator
* @param set set to iterate over
*/
UnicodeSetIterator::UnicodeSetIterator(const UnicodeSet& set) :
abbreviated(FALSE)
{
UnicodeSetIterator::UnicodeSetIterator(const UnicodeSet& set) {
reset(set);
}
/**
* Create an iterator. Convenience for when the contents are to be set later.
*/
UnicodeSetIterator::UnicodeSetIterator() :
abbreviated(FALSE)
{
UnicodeSetIterator::UnicodeSetIterator() {
this->set = NULL;
reset();
}
@ -126,28 +122,9 @@ void UnicodeSetIterator::reset() {
nextString = 0;
}
/**
* Causes the interation to only to part of long ranges
* @internal -- used only for testing
*/
void UnicodeSetIterator::setAbbreviated(UBool abbr) {
abbreviated = abbr;
}
/**
* Causes the interation to only to part of long ranges
* @internal -- used only for testing
*/
UBool UnicodeSetIterator::getAbbreviated() {
return abbreviated;
}
void UnicodeSetIterator::loadRange(int32_t range) {
nextElement = set->getRangeStart(range);
endElement = set->getRangeEnd(range);
if (abbreviated && (endElement > nextElement + 50)) {
endElement = nextElement + 50;
}
}
U_NAMESPACE_END