ICU-8330 Fix ICU4C handling of 'S' (fractional seconds) in skeleton
X-SVN-Rev: 29421
This commit is contained in:
Peter Edberg
parent
210158112e
commit
2c5bd3f343
@ -1,6 +1,6 @@
|
||||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2007-2010, International Business Machines Corporation and
|
||||
* Copyright (C) 2007-2011, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*
|
||||
@ -1022,9 +1022,7 @@ DateTimePatternGenerator::adjustFieldTypes(const UnicodeString& pattern,
|
||||
if (fixFractionalSeconds && typeValue == UDATPG_SECOND_FIELD) {
|
||||
UnicodeString newField=dtMatcher->skeleton.original[UDATPG_FRACTIONAL_SECOND_FIELD];
|
||||
field = field + decimal + newField;
|
||||
}
|
||||
else {
|
||||
if (dtMatcher->skeleton.type[typeValue]!=0) {
|
||||
} else if (dtMatcher->skeleton.type[typeValue]!=0) {
|
||||
// Here:
|
||||
// - "reqField" is the field from the originally requested skeleton, with length
|
||||
// "reqFieldLen".
|
||||
@ -1050,7 +1048,7 @@ DateTimePatternGenerator::adjustFieldTypes(const UnicodeString& pattern,
|
||||
UnicodeString reqField = dtMatcher->skeleton.original[typeValue];
|
||||
int32_t reqFieldLen = reqField.length();
|
||||
if (reqField.charAt(0) == CAP_E && reqFieldLen < 3)
|
||||
reqFieldLen = 3; // 1-3 for E are equivalent to 3 for c,e
|
||||
reqFieldLen = 3; // 1-3 for E are equivalent to 3 for c,e
|
||||
int32_t adjFieldLen = reqFieldLen;
|
||||
if ( (typeValue==UDATPG_HOUR_FIELD && (options & UDATPG_MATCH_HOUR_FIELD_LENGTH)==0) ||
|
||||
(typeValue==UDATPG_MINUTE_FIELD && (options & UDATPG_MATCH_MINUTE_FIELD_LENGTH)==0) ||
|
||||
@ -1072,9 +1070,8 @@ DateTimePatternGenerator::adjustFieldTypes(const UnicodeString& pattern,
|
||||
for (int32_t i=adjFieldLen; i>0; --i) {
|
||||
field+=c;
|
||||
}
|
||||
}
|
||||
newPattern+=field;
|
||||
}
|
||||
newPattern+=field;
|
||||
}
|
||||
}
|
||||
return newPattern;
|
||||
@ -1082,7 +1079,7 @@ DateTimePatternGenerator::adjustFieldTypes(const UnicodeString& pattern,
|
||||
|
||||
UnicodeString
|
||||
DateTimePatternGenerator::getBestAppending(int32_t missingFields, UDateTimePatternMatchOptions options) {
|
||||
UnicodeString resultPattern, tempPattern, formattedPattern;
|
||||
UnicodeString resultPattern, tempPattern;
|
||||
UErrorCode err=U_ZERO_ERROR;
|
||||
int32_t lastMissingFieldMask=0;
|
||||
if (missingFields!=0) {
|
||||
@ -1099,8 +1096,7 @@ DateTimePatternGenerator::getBestAppending(int32_t missingFields, UDateTimePatte
|
||||
}
|
||||
if (((distanceInfo->missingFieldMask & UDATPG_SECOND_AND_FRACTIONAL_MASK)==UDATPG_FRACTIONAL_MASK) &&
|
||||
((missingFields & UDATPG_SECOND_AND_FRACTIONAL_MASK) == UDATPG_SECOND_AND_FRACTIONAL_MASK)) {
|
||||
resultPattern = adjustFieldTypes(resultPattern, specifiedSkeleton, FALSE, options);
|
||||
//resultPattern = tempPattern;
|
||||
resultPattern = adjustFieldTypes(resultPattern, specifiedSkeleton, TRUE, options);
|
||||
distanceInfo->missingFieldMask &= ~UDATPG_FRACTIONAL_MASK;
|
||||
continue;
|
||||
}
|
||||
@ -1117,11 +1113,11 @@ DateTimePatternGenerator::getBestAppending(int32_t missingFields, UDateTimePatte
|
||||
appendName
|
||||
};
|
||||
UnicodeString emptyStr;
|
||||
formattedPattern = MessageFormat::format(appendItemFormats[topField], formatPattern, 3, emptyStr, err);
|
||||
resultPattern = MessageFormat::format(appendItemFormats[topField], formatPattern, 3, emptyStr, err);
|
||||
lastMissingFieldMask = distanceInfo->missingFieldMask;
|
||||
}
|
||||
}
|
||||
return formattedPattern;
|
||||
return resultPattern;
|
||||
}
|
||||
|
||||
int32_t
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 2008-2010, International Business Machines Corporation and
|
||||
* Copyright (c) 2008-2011, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
||||
@ -55,6 +55,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
UnicodeString("yyyyMMMM"), // 11
|
||||
UnicodeString("MMMEd"), // 12
|
||||
UnicodeString("Ed"), // 13
|
||||
UnicodeString("jmmssSSS"), // 14
|
||||
UnicodeString(),
|
||||
};
|
||||
|
||||
@ -85,8 +86,9 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
UnicodeString("11:58 PM"), // 09: jjmm
|
||||
UnicodeString("58:59"), // 10: mmss
|
||||
UnicodeString("January 1999"), // 11: yyyyMMMM
|
||||
UnicodeString("Wed, Jan 13"), // 12: MMMEd -> EEE, MMM d"
|
||||
UnicodeString("Wed, Jan 13"), // 12: MMMEd -> EEE, MMM d
|
||||
UnicodeString("13 Wed"), // 13: Ed -> d EEE
|
||||
UnicodeString("11:58:59.123 PM"), // 14: jmmssSSS -> "h:mm:ss.SSS a"
|
||||
|
||||
// en_US@calendar=japanese // 1 en_US@calendar=japanese
|
||||
UnicodeString("1/11 Heisei"), // 0: yM
|
||||
@ -103,6 +105,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
UnicodeString("January 11 Heisei"), // 11: yyyyMMMM
|
||||
UnicodeString("Wed, Jan 13"), // 12: MMMEd -> EEE, MMM d"
|
||||
UnicodeString("13 Wed"), // 13: Ed -> d EEE
|
||||
UnicodeString("11:58:59.123 PM"), // 14: jmmssSSS -> "h:mm:ss.SSS a"
|
||||
|
||||
// de_DE // 2 de_DE
|
||||
UnicodeString("1.1999"), // 00: yM
|
||||
@ -118,7 +121,8 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
UnicodeString("58:59"), // 10: mmss
|
||||
UnicodeString("Januar 1999"), // 11: yyyyMMMM
|
||||
UnicodeString("Mi., 13. Jan"), // 12: MMMEd -> EEE, d. MMM
|
||||
UnicodeString("Mi., 13."), // 13: Ed -> EEE, d.
|
||||
UnicodeString("Mi., 13."), // 13: Ed -> EEE, d.
|
||||
UnicodeString("23:58:59,123"), // 14: jmmssSSS -> "HH:mm:ss,SSS"
|
||||
|
||||
// fi // 3 fi
|
||||
UnicodeString("1.1999"), // 00: yM (fixed expected result per ticket:6626:)
|
||||
@ -135,6 +139,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
UnicodeString("tammikuu 1999"), // 11: yyyyMMMM
|
||||
UnicodeString("ke 13. tammikuuta"), // 12: MMMEd -> EEE d. MMM
|
||||
UnicodeString("ke 13."), // 13: Ed -> ccc d.
|
||||
UnicodeString("23.58.59,123"), // 14: jmmssSSS -> "H.mm.ss,SSS"
|
||||
|
||||
// ja // 4 ja
|
||||
UnicodeString("1999/1"), // 00: yM -> y/M
|
||||
@ -151,6 +156,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
CharsToUnicodeString("1999\\u5E741\\u6708"), // 11: yyyyMMMM -> y\u5E74M\u6708
|
||||
CharsToUnicodeString("1\\u670813\\u65E5(\\u6C34)"), // 12: MMMEd -> M\u6708d\u65E5(EEE)
|
||||
CharsToUnicodeString("13\\u65E5(\\u6C34)"), // 13: Ed -> d\u65E5(EEE)
|
||||
UnicodeString("23:58:59.123"), // 14: jmmssSSS -> "H:mm:ss.SSS"
|
||||
|
||||
// ja@calendar=japanese // 5 ja@calendar=japanese
|
||||
CharsToUnicodeString("\\u5E73\\u621011/1"), // 00: yM -> Gy/m
|
||||
@ -167,6 +173,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
CharsToUnicodeString("\\u5E73\\u621011\\u5E741\\u6708"), // 11: yyyyMMMM -> Gyyyy\u5E74M\u6708
|
||||
CharsToUnicodeString("1\\u670813\\u65E5(\\u6C34)"), // 12: MMMEd -> M\u6708d\u65E5(EEE)
|
||||
CharsToUnicodeString("13\\u65E5(\\u6C34)"), // 13: Ed -> d\u65E5(EEE)
|
||||
UnicodeString("23:58:59.123"), // 14: jmmssSSS -> "H:mm:ss.SSS"
|
||||
|
||||
// zh_Hans_CN // 6 zh_Hans_CN
|
||||
UnicodeString("1999-1", -1, US_INV), // 00: yM
|
||||
@ -183,6 +190,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
CharsToUnicodeString("1999\\u5E741\\u6708"), // 11: yyyyMMMM -> yyyy\u5E74MMM
|
||||
CharsToUnicodeString("1\\u670813\\u65E5\\u5468\\u4E09"), // 12: MMMEd -> MMMd\u65E5EEE
|
||||
CharsToUnicodeString("13\\u65E5\\u5468\\u4E09"), // 13: Ed -> d\u65E5EEE
|
||||
CharsToUnicodeString("\\u4E0B\\u534811:58:59.123"), // 14: jmmssSSS -> "ah:mm:ss.SSS"
|
||||
|
||||
// zh_TW@calendar=roc // 7 zh_TW@calendar=roc
|
||||
CharsToUnicodeString("\\u6C11\\u570B88/1"), // 00: yM -> Gy/M
|
||||
@ -199,6 +207,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
CharsToUnicodeString("\\u6C11\\u570B88\\u5E741\\u6708"), // 11: yyyyMMMM -> Gy\u5E74M\u670
|
||||
CharsToUnicodeString("1\\u670813\\u65E5\\u9031\\u4E09"), // 12: MMMEd -> M\u6708d\u65E5EEE
|
||||
CharsToUnicodeString("13\\u65E5(\\u9031\\u4E09)"), // 13: Ed -> d\u65E5(EEE)
|
||||
CharsToUnicodeString("\\u4E0B\\u534811:58:59.123"), // 14: jmmssSSS -> "ah:mm:ss.SSS"
|
||||
|
||||
// ru // 8 ru
|
||||
UnicodeString("1.1999"), // 00: yM -> M.y
|
||||
@ -215,6 +224,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
CharsToUnicodeString("\\u042F\\u043D\\u0432\\u0430\\u0440\\u044C 1999"), // 11: yyyyMMMM -> LLLL y
|
||||
CharsToUnicodeString("\\u0421\\u0440, 13 \\u044F\\u043D\\u0432."), // 12: MMMEd -> ccc, d MMM
|
||||
CharsToUnicodeString("\\u0441\\u0440, 13"), // 13: Ed -> EEE, d
|
||||
UnicodeString("23:58:59,123"), // 14: jmmssSSS -> "H:mm:ss,SSS"
|
||||
|
||||
UnicodeString(),
|
||||
};
|
||||
@ -547,7 +557,7 @@ void IntlTestDateTimePatternGeneratorAPI::testAPI(/*char *par*/)
|
||||
int32_t localeIndex=0;
|
||||
int32_t resultIndex=0;
|
||||
UnicodeString resultDate;
|
||||
UDate testDate= LocaleTest::date(99, 0, 13, 23, 58, 59);
|
||||
UDate testDate= LocaleTest::date(99, 0, 13, 23, 58, 59) + 123.0;
|
||||
while (localeIndex < MAX_LOCALE )
|
||||
{
|
||||
int32_t dataIndex=0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user