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

ICU-20418 Adding *internal* parse method for core unit identifiers.

Browse source 
Also see ICU-20286
This commit is contained in:
Shane Carr 2019-12-11 20:46:18 -08:00 • committed by Shane F. Carr
parent b24538eb05
commit df8841aa6f
2 changed files with 69 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
icu4c/source/i18n/measunit.cpp
View file

@ -1990,10 +1990,10 @@ MeasureUnit MeasureUnit::getTeaspoon() {
// End generated code
static int32_t binarySearch(
const char * const * array, int32_t start, int32_t end, const char * key) {
const char * const * array, int32_t start, int32_t end, StringPiece key) {
while (start < end) {
int32_t mid = (start + end) / 2;
int32_t cmp = uprv_strcmp(array[mid], key);
int32_t cmp = StringPiece(array[mid]).compare(key);
if (cmp < 0) {
start = mid + 1;
continue;
@ -2138,6 +2138,53 @@ int32_t MeasureUnit::internalGetIndexForTypeAndSubtype(const char *type, const c
return gIndexes[t] + st - gOffsets[t];
}
bool MeasureUnit::findBySubType(StringPiece subType, MeasureUnit* output) {
for (int32_t t = 0; t < UPRV_LENGTHOF(gOffsets) - 1; t++) {
// Skip currency units
if (gIndexes[t] == gIndexes[t + 1]) {
continue;
}
int32_t st = binarySearch(gSubTypes, gOffsets[t], gOffsets[t + 1], subType);
if (st >= 0) {
output->setTo(t, st - gOffsets[t]);
return true;
}
}
return false;
}
bool MeasureUnit::parseCoreUnitIdentifier(
StringPiece coreUnitIdentifier,
MeasureUnit* numerator,
MeasureUnit* denominator,
UErrorCode& status) {
if (U_FAILURE(status)) {
return false;
}
// First search for the whole code unit identifier as a subType
if (findBySubType(coreUnitIdentifier, numerator)) {
return false; // found a numerator but not denominator
}
// If not found, try breaking apart numerator and denominator
int32_t perIdx = coreUnitIdentifier.find("-per-", 0);
if (perIdx == -1) {
// String does not contain "-per-"
status = U_ILLEGAL_ARGUMENT_ERROR;
return false;
}
StringPiece numeratorStr(coreUnitIdentifier, 0, perIdx);
StringPiece denominatorStr(coreUnitIdentifier, perIdx + 5);
if (findBySubType(numeratorStr, numerator) && findBySubType(denominatorStr, denominator)) {
return true; // found both a numerator and denominator
}
// The numerator or denominator were invalid
status = U_ILLEGAL_ARGUMENT_ERROR;
return false;
}
MeasureUnit MeasureUnit::resolveUnitPerUnit(
const MeasureUnit &unit, const MeasureUnit &perUnit, bool* isResolved) {
int32_t unitOffset = unit.getOffset();

20
icu4c/source/i18n/unicode/measunit.h
View file

@ -194,6 +194,26 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static int32_t internalGetIndexForTypeAndSubtype(const char *type, const char *subtype);
/**
* ICU use only.
* @return Whether subType is known to ICU.
* @internal
*/
static bool findBySubType(StringPiece subType, MeasureUnit* output);
/**
* ICU use only.
* Parse a core unit identifier into a numerator and denominator unit.
* @param coreUnitIdentifier The string to parse.
* @param numerator Output: set to the numerator unit.
* @param denominator Output: set to the denominator unit, if present.
* @param status Set to U_ILLEGAL_ARGUMENT_ERROR if the core unit identifier is not known.
* @return Whether both a numerator and denominator are returned.
* @internal
*/
static bool parseCoreUnitIdentifier(
StringPiece coreUnitIdentifier, MeasureUnit* numerator, MeasureUnit* denominator, UErrorCode& status);
/**
* ICU use only.
* @internal