AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1115 use index_outofbounds_error instead of illegal for itemIndex>=count; add TODO

Browse Source 
X-SVN-Rev: 9537
This commit is contained in:
Markus Scherer 2002-08-02 01:14:53 +00:00
parent 8697b8894f
commit 2ecdab9e2e
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
icu4c/source/common/uset.cpp
View File

@ -153,19 +153,25 @@ uset_getItem(const USet* uset, int32_t itemIndex,
UErrorCode* ec) {
if (U_FAILURE(*ec)) return 0;
const UnicodeSet& set = *(const UnicodeSet*)uset;
if ((uint32_t) itemIndex < (uint32_t) set.getRangeCount()) {
int32_t rangeCount;
if (itemIndex < 0) {
*ec = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
} else if (itemIndex < (rangeCount = set.getRangeCount())) {
*start = set.getRangeStart(itemIndex);
*end = set.getRangeEnd(itemIndex);
return 0;
} else {
itemIndex -= set.getRangeCount();
if ((uint32_t) itemIndex < (uint32_t) USetAccess::getStringCount(set)) {
itemIndex -= rangeCount;
if (itemIndex < USetAccess::getStringCount(set)) {
const UnicodeString* s = USetAccess::getString(set, itemIndex);
return s->extract(str, strCapacity, *ec);
} else {
*ec = U_INDEX_OUTOFBOUNDS_ERROR;
return -1;
}
}
*ec = U_ILLEGAL_ARGUMENT_ERROR;
return -1;
}
//U_CAPI int32_t U_EXPORT2
@ -362,6 +368,11 @@ uset_getSerializedRange(const USerializedSet* set, int32_t rangeIndex,
}
}
// TODO The old, internal uset.c had an efficient uset_containsOne function.
// Returned the one and only code point, or else -1 or something.
// Consider adding such a function to both C and C++ UnicodeSet/uset.
// See tools/gennorm/store.c for usage, now usetContainsOne there.
// TODO Investigate incorporating this code into UnicodeSet to improve
// efficiency.
// ---