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

ICU-7912 commit from review comments (thx)

Browse Source 
X-SVN-Rev: 34416
This commit is contained in:
Steven R. Loomis 2013-09-20 05:00:30 +00:00
parent 12c5e946e9
commit 4650ca64e3
9 changed files with 64 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
icu4c/source/i18n/fmtable.cpp
View File

@ -401,7 +401,7 @@ Formattable::getLong(UErrorCode& status) const
switch (fType) {
case Formattable::kLong:
return (int32_t)fValue.fInt64;
case Formattable::kInt64:
case Formattable::kInt64:
if (fValue.fInt64 > INT32_MAX) {
status = U_INVALID_FORMAT_ERROR;
return INT32_MAX;
@ -893,8 +893,11 @@ FormattableStreamer::streamOut(ostream& stream, const Formattable& obj)
#endif
/* ---- UFormattable stuff ---- */
U_NAMESPACE_END
/* ---- UFormattable implementation ---- */
U_NAMESPACE_USE
U_DRAFT UFormattable* U_EXPORT2
ufmt_open(UErrorCode *status) {
@ -917,49 +920,24 @@ ufmt_close(UFormattable *fmt) {
}
U_INTERNAL UFormattableType U_EXPORT2
ufmt_getType(UFormattable *fmt, UErrorCode *status) {
ufmt_getType(const UFormattable *fmt, UErrorCode *status) {
if(U_FAILURE(*status)) {
return (UFormattableType)-1;
}
Formattable *obj = Formattable::fromUFormattable(fmt);
switch( obj->getType() ) {
case Formattable::kDate:
return UFMT_DATE;
break;
case Formattable::kDouble:
return UFMT_DOUBLE;
break;
case Formattable::kLong:
return UFMT_LONG;
break;
case Formattable::kString:
return UFMT_STRING;
break;
case Formattable::kArray:
return UFMT_ARRAY;
break;
case Formattable::kInt64:
return UFMT_INT64;
break;
case Formattable::kObject:
return UFMT_OBJECT;
break;
default:
*status = U_ILLEGAL_ARGUMENT_ERROR;
return (UFormattableType)-1; // invalid
}
const Formattable *obj = Formattable::fromUFormattable(fmt);
return (UFormattableType)obj->getType();
}
U_INTERNAL UBool U_EXPORT2
ufmt_isNumeric(UFormattable *fmt) {
Formattable *obj = Formattable::fromUFormattable(fmt);
ufmt_isNumeric(const UFormattable *fmt) {
const Formattable *obj = Formattable::fromUFormattable(fmt);
return obj->isNumeric();
}
U_DRAFT UDate U_EXPORT2
ufmt_getDate(UFormattable *fmt, UErrorCode *status) {
Formattable *obj = Formattable::fromUFormattable(fmt);
ufmt_getDate(const UFormattable *fmt, UErrorCode *status) {
const Formattable *obj = Formattable::fromUFormattable(fmt);
return obj->getDate(*status);
}
@ -980,8 +958,8 @@ ufmt_getLong(UFormattable *fmt, UErrorCode *status) {
U_DRAFT const void *U_EXPORT2
ufmt_getObject(UFormattable *fmt, UErrorCode *status) {
Formattable *obj = Formattable::fromUFormattable(fmt);
ufmt_getObject(const UFormattable *fmt, UErrorCode *status) {
const Formattable *obj = Formattable::fromUFormattable(fmt);
const void *ret = obj->getObject();
if( ret==NULL &&
@ -1013,8 +991,8 @@ ufmt_getUChars(UFormattable *fmt, int32_t *len, UErrorCode *status) {
}
U_DRAFT int32_t U_EXPORT2
ufmt_getArrayLength(UFormattable* fmt, UErrorCode *status) {
Formattable *obj = Formattable::fromUFormattable(fmt);
ufmt_getArrayLength(const UFormattable* fmt, UErrorCode *status) {
const Formattable *obj = Formattable::fromUFormattable(fmt);
int32_t count;
(void)obj->getArray(count, *status);
@ -1057,35 +1035,12 @@ ufmt_getDecNumChars(UFormattable *fmt, int32_t *len, UErrorCode *status) {
}
}
// make-a-copy version
// U_DRAFT int32_t U_EXPORT2
// ufmt_getDecNumChars(UFormattable *fmt, char *buf, int32_t len, UErrorCode *status) {
// if(U_FAILURE(*status)) {
// return 0;
// }
// Formattable *obj = Formattable::fromUFormattable(fmt);
// CharString *charString = obj->internalGetCharString(*status);
// if(U_FAILURE(*status)) {
// return 0;
// }
// if(charString == NULL) {
// *status = U_MEMORY_ALLOCATION_ERROR;
// return 0;
// } else {
// return charString->extract(buf, len, *status);
// }
// }
U_DRAFT int64_t U_EXPORT2
ufmt_getInt64(UFormattable *fmt, UErrorCode *status) {
Formattable *obj = Formattable::fromUFormattable(fmt);
return obj->getInt64(*status);
}
U_NAMESPACE_END
#endif /* #if !UCONFIG_NO_FORMATTING */
//eof

7
icu4c/source/i18n/unicode/fmtable.h
View File

@ -618,8 +618,8 @@ public:
/**
* Convert this object pointer to a UFormattable.
* @return this object as a UFormattable pointer. This is an alias to the original UFormattable,
* and so is only valid while the original argument remains in scope.
* @return this object as a UFormattable pointer. This is an alias to this object,
* and so is only valid while this object remains in scope.
* @draft ICU 52
*/
inline UFormattable *toUFormattable();
@ -729,7 +729,7 @@ inline int32_t Formattable::getLong(UErrorCode* status) const {
#endif /* U_HIDE_DEPRECATED_API */
inline UFormattable* Formattable::toUFormattable() {
return (UFormattable*)(this);
return reinterpret_cast<UFormattable*>(this);
}
inline Formattable* Formattable::fromUFormattable(UFormattable *fmt) {
@ -740,7 +740,6 @@ inline const Formattable* Formattable::fromUFormattable(const UFormattable *fmt)
return reinterpret_cast<const Formattable *>(fmt);
}
U_NAMESPACE_END
#endif /* #if !UCONFIG_NO_FORMATTING */

26
icu4c/source/i18n/unicode/uformattable.h
View File

@ -25,8 +25,8 @@
* See {@link unum_parseToUFormattable} for example code.
*/
#ifndef FORMATTABLE_H
#define FORMATTABLE_H
#ifndef UFORMATTABLE_H
#define UFORMATTABLE_H
#include "unicode/utypes.h"
@ -45,10 +45,10 @@ typedef enum UFormattableType {
UFMT_DATE = 0, /**< ufmt_getDate() will return without conversion. @see ufmt_getDate*/
UFMT_DOUBLE, /**< ufmt_getDouble() will return without conversion. @see ufmt_getDouble*/
UFMT_LONG, /**< ufmt_getLong() will return without conversion. @see ufmt_getLong */
UFMT_INT64, /**< ufmt_getInt64() will return without conversion. @see ufmt_getInt64 */
UFMT_OBJECT, /**< ufmt_getObject() will return without conversion. @see ufmt_getObject*/
UFMT_STRING, /**< ufmt_getUChars() will return without conversion. @see ufmt_getUChars*/
UFMT_ARRAY, /**< ufmt_countArray() and ufmt_getArray() will return the value. @see ufmt_getArrayItemByIndex */
UFMT_INT64, /**< ufmt_getInt64() will return without conversion. @see ufmt_getInt64 */
UFMT_OBJECT, /**< ufmt_getObject() will return without conversion. @see ufmt_getObject*/
UFMT_COUNT /**< Count of defined UFormattableType values */
} UFormattableType;
@ -76,7 +76,7 @@ ufmt_open(UErrorCode* status);
/**
* Cleanup any additional memory allocated by this UFormattable.
* @param fmt the formatter
* @param fmt the formatter
* @draft ICU 52
* @see ufmt_open
*/
@ -113,7 +113,7 @@ U_NAMESPACE_END
* @draft ICU 52
*/
U_DRAFT UFormattableType U_EXPORT2
ufmt_getType(UFormattable* fmt, UErrorCode *status);
ufmt_getType(const UFormattable* fmt, UErrorCode *status);
/**
* Return whether the object is numeric.
@ -124,7 +124,7 @@ ufmt_getType(UFormattable* fmt, UErrorCode *status);
* @draft ICU 52
*/
U_DRAFT UBool U_EXPORT2
ufmt_isNumeric(UFormattable* fmt);
ufmt_isNumeric(const UFormattable* fmt);
/**
* Gets the UDate value of this object. If the type is not of type UFMT_DATE,
@ -137,12 +137,12 @@ ufmt_isNumeric(UFormattable* fmt);
* @see icu::Formattable::getDate(UErrorCode&) const
*/
U_DRAFT UDate U_EXPORT2
ufmt_getDate(UFormattable* fmt, UErrorCode *status);
ufmt_getDate(const UFormattable* fmt, UErrorCode *status);
/**
* Gets the double value of this object. If the type is not a UFMT_DOUBLE, or
* if there are additional significant digits than fit in a double type,
* a conversion is performed with possible loss of precision.
* a conversion is performed with possible loss of precision.
* If the type is UFMT_OBJECT and the
* object is a Measure, then the result of
* getNumber().getDouble(status) is returned. If this object is
@ -201,7 +201,7 @@ ufmt_getInt64(UFormattable* fmt, UErrorCode *status);
/**
* Returns a pointer to the UObject contained within this
* formattable (as a const void*), or NULL if this object
* formattable (as a const void*), or NULL if this object
* is not of type UFMT_OBJECT.
* @param fmt the UFormattable object
* @param status the error code - any conversion or format errors
@ -210,7 +210,7 @@ ufmt_getInt64(UFormattable* fmt, UErrorCode *status);
* @see icu::Formattable::getObject() const
*/
U_DRAFT const void *U_EXPORT2
ufmt_getObject(UFormattable* fmt, UErrorCode *status);
ufmt_getObject(const UFormattable* fmt, UErrorCode *status);
/**
* Gets the string value of this object as a UChar string. If the type is not a
@ -236,7 +236,7 @@ ufmt_getUChars(UFormattable* fmt, int32_t *len, UErrorCode *status);
* @see ufmt_getArrayItemByIndex
*/
U_DRAFT int32_t U_EXPORT2
ufmt_getArrayLength(UFormattable* fmt, UErrorCode *status);
ufmt_getArrayLength(const UFormattable* fmt, UErrorCode *status);
/**
* Get the specified value from the array of UFormattables. Invalid if the object is not an array type UFMT_ARRAY
@ -258,7 +258,7 @@ ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status);
* the limits of a double floating point or a 64 bit int.
*
* This function is not thread safe, and therfore is not declared const,
* even though it is logically const.
* even though it is logically const.
* The resulting buffer is owned by the UFormattable and is invalid if any other functions are
* called on the UFormattable.
*

8
icu4c/source/i18n/unicode/unum.h
View File

@ -553,13 +553,13 @@ unum_formatDecimal( const UNumberFormat* fmt,
* @see UFieldPosition
* @stable ICU 3.0
*/
U_STABLE int32_t U_EXPORT2
U_STABLE int32_t U_EXPORT2
unum_formatDoubleCurrency(const UNumberFormat* fmt,
double number,
UChar* currency,
UChar* result,
int32_t resultLength,
UFieldPosition* pos, /* ignored if 0 */
UFieldPosition* pos,
UErrorCode* status);
/**
@ -578,7 +578,7 @@ unum_formatDoubleCurrency(const UNumberFormat* fmt,
* parameter may be NULL, in which case it is ignored.
* @param status a pointer to an input-output UErrorCode
* @return the total buffer size needed; if greater than resultLength,
* the output was truncated.
* the output was truncated. Will return 0 on error.
* @see unum_parseToUFormattable
* @draft ICU 52
*/
@ -587,7 +587,7 @@ unum_formatUFormattable(const UNumberFormat* fmt,
const UFormattable *number,
UChar *result,
int32_t resultLength,
UFieldPosition *pos, /* ignored if 0 */
UFieldPosition *pos,
UErrorCode *status);
/**

34
icu4c/source/i18n/unum.cpp
View File

@ -790,13 +790,20 @@ unum_parseToUFormattable(const UNumberFormat* fmt,
int32_t textLength,
int32_t* parsePos, /* 0 = start */
UErrorCode* status) {
if(result == NULL) { // allocate if not allocated.
result = ufmt_open(status); // does an error check
UFormattable *newFormattable = NULL;
if (U_FAILURE(*status)) return result;
if (fmt == NULL) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return result;
}
if (result == NULL) { // allocate if not allocated.
newFormattable = result = ufmt_open(status);
}
if(U_FAILURE(*status)) return result;
parseRes(*(Formattable::fromUFormattable(result)), fmt, text, textLength, parsePos, status);
if (U_FAILURE(*status) && newFormattable != NULL) {
ufmt_close(newFormattable);
result = NULL; // deallocate if there was a parse error
}
return result;
}
@ -807,16 +814,15 @@ unum_formatUFormattable(const UNumberFormat* fmt,
int32_t resultLength,
UFieldPosition *pos, /* ignored if 0 */
UErrorCode *status) {
// cribbed from unum_formatInt64
if(U_FAILURE(*status))
return -1;
UnicodeString res;
if(!(result==NULL && resultLength==0)) {
// NULL destination for pure preflighting: empty dummy string
// otherwise, alias the destination buffer
res.setTo(result, 0, resultLength);
if (U_FAILURE(*status)) {
return 0;
}
if (fmt == NULL || number==NULL ||
(result==NULL ? resultLength!=0 : resultLength<0)) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
UnicodeString res(result, 0, resultLength);
FieldPosition fp;

10
icu4c/source/test/cintltst/cnumtst.c
View File

@ -2188,7 +2188,7 @@ static void TestUFormattable(void) {
{
UErrorCode status = U_ZERO_ERROR;
UNumberFormat *unum = unum_open(UNUM_DEFAULT, NULL, -1, "en_US_POSIX", NULL, &status);
if(assertSuccessCheck("calling ufmt_open()", &status, TRUE)) {
if(assertSuccessCheck("calling unum_open()", &status, TRUE)) {
//! [unum_parseToUFormattable]
const UChar str[] = { 0x0031, 0x0032, 0x0033, 0x0000 }; /* 123 */
int32_t result = 0;
@ -2213,7 +2213,7 @@ static void TestUFormattable(void) {
ufmt = ufmt_open(&status);
unum = unum_open(UNUM_DEFAULT, NULL, -1, "en_US_POSIX", NULL, &status);
if(assertSuccessCheck("calling ufmt_open()", &status, TRUE)) {
if(assertSuccessCheck("calling ufmt_open() || unum_open()", &status, TRUE)) {
pattern = "31337";
log_verbose("-- pattern: %s\n", pattern);
@ -2261,11 +2261,11 @@ static void TestUFormattable(void) {
u_uastrcpy(buffer, pattern);
unum = unum_open(UNUM_DEFAULT, NULL, -1, "en_US_POSIX", NULL, &status);
if(assertSuccessCheck("calling ufmt_open()", &status, TRUE)) {
if(assertSuccessCheck("calling unum_open()", &status, TRUE)) {
ufmt = unum_parseToUFormattable(unum, NULL, /* will be unum_open()'ed for us */
ufmt = unum_parseToUFormattable(unum, NULL, /* will be ufmt_open()'ed for us */
buffer, -1, NULL, &status);
if(assertSuccess("unum_parseToUFormattable(weight of the moon", &status)) {
if(assertSuccess("unum_parseToUFormattable(weight of the moon)", &status)) {
log_verbose("new formattable allocated at %p\n", (void*)ufmt);
assertTrue("ufmt_isNumeric() TRUE", ufmt_isNumeric(ufmt));
unum_formatUFormattable(unum, ufmt, out2k, 2048, NULL, &status);

2
icu4c/source/test/intltest/intltest.cpp
View File

@ -218,7 +218,7 @@ UnicodeString toString(int32_t n) {
UnicodeString toString(UBool b) {
return b ? UnicodeString("TRUE"):UnicodeString("false");
return b ? UnicodeString("TRUE"):UnicodeString("FALSE");
}
// stephen - cleaned up 05/05/99

2
icu4c/source/test/intltest/intltest.h
View File

@ -51,7 +51,7 @@ U_NAMESPACE_USE
//string-concatenation operator (moved from findword test by rtg)
UnicodeString UCharToUnicodeString(UChar c);
UnicodeString Int64ToUnicodeString(int64_t num);
//UnicodeString operator+(const UnicodeString& left, int64_t num);
//UnicodeString operator+(const UnicodeString& left, int64_t num); // Some compilers don't allow this because of the long type.
UnicodeString operator+(const UnicodeString& left, long num);
UnicodeString operator+(const UnicodeString& left, unsigned long num);
UnicodeString operator+(const UnicodeString& left, double num);

1
icu4c/source/test/intltest/numfmtst.cpp
View File

@ -6832,6 +6832,7 @@ UBool NumberFormatTest::testFormattableAsUFormattable(const char *file, int line
const UChar* uch = ufmt_getUChars(u, &len, &valueStatus);
if(U_SUCCESS(valueStatus)) {
UnicodeString str2(uch, len);
assertTrue("UChar* NULL-terminated", uch[len]==0);
exactMatch = (str == str2);
}
triedExact = TRUE;