From: Andy Heninger Date: Sat, 18 Jun 2016 21:49:10 +0000 (+0000) Subject: ICU-7700 Revert change #38862, hour-of-day setting logic, which broke some tests. X-Git-Tag: milestone-59-0-1~371 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25f3f102044f0fd4d8938791ec72f37d4ec808ae;p=icu ICU-7700 Revert change #38862, hour-of-day setting logic, which broke some tests. X-SVN-Rev: 38865 --- diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp index ae1c96bca3b..53de270eaa7 100644 --- a/icu4c/source/i18n/calendar.cpp +++ b/icu4c/source/i18n/calendar.cpp @@ -8,12 +8,12 @@ * * File CALENDAR.CPP * -* Modification History: +* Modification History: * * Date Name Description * 02/03/97 clhuang Creation. -* 04/22/97 aliu Cleaned up, fixed memory leak, made -* setWeekCountData() more robust. +* 04/22/97 aliu Cleaned up, fixed memory leak, made +* setWeekCountData() more robust. * Moved platform code to TPlatformUtilities. * 05/01/97 aliu Made equals(), before(), after() arguments const. * 05/20/97 aliu Changed logic of when to compute fields and time @@ -26,7 +26,7 @@ ******************************************************************************* */ -#include "utypeinfo.h" // for 'typeid' to work +#include "utypeinfo.h" // for 'typeid' to work #include "unicode/utypes.h" @@ -93,9 +93,9 @@ U_CDECL_END #if defined( U_DEBUG_CALSVC ) || defined (U_DEBUG_CAL) -/** - * fldName was removed as a duplicate implementation. - * use udbg_ services instead, +/** + * fldName was removed as a duplicate implementation. + * use udbg_ services instead, * which depend on include files and library from ../tools/toolutil, the following circular link: * CPPFLAGS+=-I$(top_srcdir)/tools/toolutil * LIBS+=$(LIBICUTOOLUTIL) @@ -123,7 +123,7 @@ void ucal_dump(const Calendar &cal) { void Calendar::dump() const { int i; fprintf(stderr, "@calendar=%s, timeset=%c, fieldset=%c, allfields=%c, virtualset=%c, t=%.2f", - getType(), fIsTimeSet?'y':'n', fAreFieldsSet?'y':'n', fAreAllFieldsSet?'y':'n', + getType(), fIsTimeSet?'y':'n', fAreFieldsSet?'y':'n', fAreAllFieldsSet?'y':'n', fAreFieldsVirtuallySet?'y':'n', fTime); @@ -135,9 +135,9 @@ void Calendar::dump() const { fprintf(stderr, " %25s: %-11ld", f, fFields[i]); if(fStamp[i] == kUnset) { fprintf(stderr, " (unset) "); - } else if(fStamp[i] == kInternallySet) { + } else if(fStamp[i] == kInternallySet) { fprintf(stderr, " (internally set) "); - //} else if(fStamp[i] == kInternalDefault) { + //} else if(fStamp[i] == kInternalDefault) { // fprintf(stderr, " (internal default) "); } else { fprintf(stderr, " %%%d ", fStamp[i]); @@ -213,7 +213,7 @@ const SharedCalendar *LocaleCacheKey::createObject( const void * /*unusedCreationContext*/, UErrorCode &status) const { Calendar *calendar = Calendar::makeInstance(fLoc, status); if (U_FAILURE(status)) { - return NULL; + return NULL; } SharedCalendar *shared = new SharedCalendar(calendar); if (shared == NULL) { @@ -234,7 +234,7 @@ static ECalType getCalendarType(const char *s) { return CALTYPE_UNKNOWN; } -static UBool isStandardSupportedKeyword(const char *keyword, UErrorCode& status) { +static UBool isStandardSupportedKeyword(const char *keyword, UErrorCode& status) { if(U_FAILURE(status)) { return FALSE; } @@ -291,7 +291,7 @@ static ECalType getCalendarTypeForLocale(const char *locid) { if (U_FAILURE(status)) { return CALTYPE_GREGORIAN; } - + // Read preferred calendar values from supplementalData calendarPreference UResourceBundle *rb = ures_openDirect(NULL, "supplementalData", &status); ures_getByKey(rb, "calendarPreferenceData", rb, &status); @@ -394,7 +394,7 @@ static Calendar *createStandardCalendar(ECalType calType, const Locale &loc, UEr // ------------------------------------- /** -* a Calendar Factory which creates the "basic" calendar types, that is, those +* a Calendar Factory which creates the "basic" calendar types, that is, those * shipped with ICU. */ class BasicCalendarFactory : public LocaleKeyFactory { @@ -408,7 +408,7 @@ public: virtual ~BasicCalendarFactory(); protected: - //virtual UBool isSupportedID( const UnicodeString& id, UErrorCode& status) const { + //virtual UBool isSupportedID( const UnicodeString& id, UErrorCode& status) const { // if(U_FAILURE(status)) { // return FALSE; // } @@ -466,7 +466,7 @@ protected: BasicCalendarFactory::~BasicCalendarFactory() {} -/** +/** * A factory which looks up the DefaultCalendar resource to determine which class of calendar to use */ @@ -510,7 +510,7 @@ public: virtual UObject* cloneInstance(UObject* instance) const { UnicodeString *s = dynamic_cast(instance); if(s != NULL) { - return s->clone(); + return s->clone(); } else { #ifdef U_DEBUG_CALSVC_F UErrorCode status2 = U_ZERO_ERROR; @@ -573,7 +573,7 @@ initCalendarService(UErrorCode &status) fprintf(stderr, "Registering classes..\n"); #endif - // Register all basic instances. + // Register all basic instances. gService->registerFactory(new BasicCalendarFactory(),status); #ifdef U_DEBUG_CALSVC @@ -589,7 +589,7 @@ initCalendarService(UErrorCode &status) } } -static ICULocaleService* +static ICULocaleService* getCalendarService(UErrorCode &status) { umtx_initOnce(gServiceInitOnce, &initCalendarService, status); @@ -741,7 +741,7 @@ fSkippedWallTime(UCAL_WALLTIME_LAST) return; } - clear(); + clear(); fZone = zone; setWeekData(aLocale, NULL, success); } @@ -848,7 +848,7 @@ Calendar::createInstance(const Locale& aLocale, UErrorCode& success) return createInstance(TimeZone::createDefault(), aLocale, success); } -// ------------------------------------- Adopting +// ------------------------------------- Adopting // Note: this is the bottleneck that actually calls the service routines. @@ -901,7 +901,7 @@ Calendar::makeInstance(const Locale& aLocale, UErrorCode& success) { c = (Calendar*)getCalendarService(success)->get(l, LocaleKey::KIND_ANY, &actualLoc2, success); if(U_FAILURE(success) || !c) { - if(U_SUCCESS(success)) { + if(U_SUCCESS(success)) { success = U_INTERNAL_PROGRAM_ERROR; // Propagate some err } return NULL; @@ -909,7 +909,7 @@ Calendar::makeInstance(const Locale& aLocale, UErrorCode& success) { str = dynamic_cast(c); if(str != NULL) { - // recursed! Second lookup returned a UnicodeString. + // recursed! Second lookup returned a UnicodeString. // Perhaps DefaultCalendar{} was set to another locale. #ifdef U_DEBUG_CALSVC char tmp[200]; @@ -983,7 +983,7 @@ Calendar::createInstance(const TimeZone& zone, const Locale& aLocale, UErrorCode if(U_SUCCESS(success) && c) { c->setTimeZone(zone); } - return c; + return c; } // ------------------------------------- @@ -1015,7 +1015,7 @@ Calendar::operator==(const Calendar& that) const U_SUCCESS(status); } -UBool +UBool Calendar::isEquivalentTo(const Calendar& other) const { return typeid(*this) == typeid(other) && @@ -1097,13 +1097,13 @@ Calendar::getNow() * Gets this Calendar's current time as a long. * @return the current time as UTC milliseconds from the epoch. */ -double +double Calendar::getTimeInMillis(UErrorCode& status) const { - if(U_FAILURE(status)) + if(U_FAILURE(status)) return 0.0; - if ( ! fIsTimeSet) + if ( ! fIsTimeSet) ((Calendar*)this)->updateTime(status); /* Test for buffer overflows */ @@ -1122,9 +1122,9 @@ Calendar::getTimeInMillis(UErrorCode& status) const * when in lenient mode the out of range values are pinned to their respective min/max. * @param date the new time in UTC milliseconds from the epoch. */ -void +void Calendar::setTimeInMillis( double millis, UErrorCode& status ) { - if(U_FAILURE(status)) + if(U_FAILURE(status)) return; if (millis > MAX_MILLIS) { @@ -1152,7 +1152,7 @@ Calendar::setTimeInMillis( double millis, UErrorCode& status ) { fStamp[i] = kUnset; fIsSet[i] = FALSE; } - + } @@ -1182,14 +1182,6 @@ Calendar::set(UCalendarDateFields field, int32_t value) if (fNextStamp == STAMP_MAX) { recalculateStamp(); } - // Setting HOUR_OF_DAY should set AM_PM appropriately. - if (field == UCAL_HOUR_OF_DAY) { - if (0 <= value && value <= 11) { - set(UCAL_AM_PM, 0); - } else { - set(UCAL_AM_PM, 1); - } - } fStamp[field] = fNextStamp++; fIsSet[field] = TRUE; // Remove later fIsTimeSet = fAreFieldsSet = fAreFieldsVirtuallySet = FALSE; @@ -1485,7 +1477,7 @@ void Calendar::computeFields(UErrorCode &ec) double localMillis = internalGetTime(); int32_t rawOffset, dstOffset; getTimeZone().getOffset(localMillis, FALSE, rawOffset, dstOffset, ec); - localMillis += (rawOffset + dstOffset); + localMillis += (rawOffset + dstOffset); // Mark fields as set. Do this before calling handleComputeFields(). uint32_t mask = //fInternalSetMask; @@ -1494,7 +1486,7 @@ void Calendar::computeFields(UErrorCode &ec) (1 << UCAL_MONTH) | (1 << UCAL_DAY_OF_MONTH) | // = UCAL_DATE (1 << UCAL_DAY_OF_YEAR) | - (1 << UCAL_EXTENDED_YEAR); + (1 << UCAL_EXTENDED_YEAR); for (int32_t i=0; iset(field, fieldValue); if (work->get(field, status) != fieldValue) { break; - } + } else { result = fieldValue; fieldValue--; @@ -2806,7 +2798,7 @@ void Calendar::validateField(UCalendarDateFields field, UErrorCode &status) { case UCAL_DAY_OF_WEEK_IN_MONTH: if (internalGet(field) == 0) { #if defined (U_DEBUG_CAL) - fprintf(stderr, "%s:%d: ILLEGAL ARG because DOW in month cannot be 0\n", + fprintf(stderr, "%s:%d: ILLEGAL ARG because DOW in month cannot be 0\n", __FILE__, __LINE__); #endif status = U_ILLEGAL_ARGUMENT_ERROR; // "DAY_OF_WEEK_IN_MONTH cannot be zero" @@ -2832,7 +2824,7 @@ void Calendar::validateField(UCalendarDateFields field, int32_t min, int32_t max int32_t value = fFields[field]; if (value < min || value > max) { #if defined (U_DEBUG_CAL) - fprintf(stderr, "%s:%d: ILLEGAL ARG because of field %s out of range %d..%d at %d\n", + fprintf(stderr, "%s:%d: ILLEGAL ARG because of field %s out of range %d..%d at %d\n", __FILE__, __LINE__,fldName(field),min,max,value); #endif status = U_ILLEGAL_ARGUMENT_ERROR; @@ -2898,7 +2890,7 @@ linesInGroup: } const UFieldResolutionTable Calendar::kDatePrecedence[] = -{ +{ { { UCAL_DAY_OF_MONTH, kResolveSTOP }, { UCAL_WEEK_OF_YEAR, UCAL_DAY_OF_WEEK, kResolveSTOP }, @@ -2919,12 +2911,12 @@ const UFieldResolutionTable Calendar::kDatePrecedence[] = { kResolveRemap | UCAL_DAY_OF_WEEK_IN_MONTH, UCAL_DAY_OF_WEEK, kResolveSTOP }, { kResolveRemap | UCAL_DAY_OF_WEEK_IN_MONTH, UCAL_DOW_LOCAL, kResolveSTOP }, { kResolveSTOP } - }, + }, {{kResolveSTOP}} }; -const UFieldResolutionTable Calendar::kDOWPrecedence[] = +const UFieldResolutionTable Calendar::kDOWPrecedence[] = { { { UCAL_DAY_OF_WEEK,kResolveSTOP, kResolveSTOP }, @@ -2935,7 +2927,7 @@ const UFieldResolutionTable Calendar::kDOWPrecedence[] = }; // precedence for calculating a year -const UFieldResolutionTable Calendar::kYearPrecedence[] = +const UFieldResolutionTable Calendar::kYearPrecedence[] = { { { UCAL_YEAR, kResolveSTOP }, @@ -3184,7 +3176,7 @@ int32_t Calendar::computeZoneOffset(double millis, int32_t millisInDay, UErrorCo return rawOffset + dstOffset; } -int32_t Calendar::computeJulianDay() +int32_t Calendar::computeJulianDay() { // We want to see if any of the date fields is newer than the // JULIAN_DAY. If not, then we use JULIAN_DAY. If so, then we do @@ -3226,9 +3218,9 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) { internalSet(UCAL_EXTENDED_YEAR, year); } -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "%s:%d: bestField= %s - y=%d\n", __FILE__, __LINE__, fldName(bestField), year); -#endif +#endif // Get the Julian day of the day BEFORE the start of this year. // If useMonth is true, get the day before the start of the month. @@ -3310,9 +3302,9 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) { date += ((monthLength - date) / 7 + dim + 1) * 7; } } else { -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "%s:%d - bf= %s\n", __FILE__, __LINE__, fldName(bestField)); -#endif +#endif if(bestField == UCAL_WEEK_OF_YEAR) { // ------------------------------------- WOY ------------- if(!isSet(UCAL_YEAR_WOY) || // YWOY not set at all or @@ -3323,30 +3315,30 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) { int32_t woy = internalGet(bestField); int32_t nextJulianDay = handleComputeMonthStart(year+1, 0, FALSE); // jd of day before jan 1 - int32_t nextFirst = julianDayToDayOfWeek(nextJulianDay + 1) - firstDayOfWeek; + int32_t nextFirst = julianDayToDayOfWeek(nextJulianDay + 1) - firstDayOfWeek; if (nextFirst < 0) { // 0..6 ldow of Jan 1 nextFirst += 7; } if(woy==1) { // FIRST WEEK --------------------------------- -#if defined (U_DEBUG_CAL) - fprintf(stderr, "%s:%d - woy=%d, yp=%d, nj(%d)=%d, nf=%d", __FILE__, __LINE__, - internalGet(bestField), resolveFields(kYearPrecedence), year+1, +#if defined (U_DEBUG_CAL) + fprintf(stderr, "%s:%d - woy=%d, yp=%d, nj(%d)=%d, nf=%d", __FILE__, __LINE__, + internalGet(bestField), resolveFields(kYearPrecedence), year+1, nextJulianDay, nextFirst); fprintf(stderr, " next: %d DFW, min=%d \n", (7-nextFirst), getMinimalDaysInFirstWeek() ); -#endif +#endif // nextFirst is now the localized DOW of Jan 1 of y-woy+1 if((nextFirst > 0) && // Jan 1 starts on FDOW (7-nextFirst) >= getMinimalDaysInFirstWeek()) // or enough days in the week { // Jan 1 of (yearWoy+1) is in yearWoy+1 - recalculate JD to next year -#if defined (U_DEBUG_CAL) - fprintf(stderr, "%s:%d - was going to move JD from %d to %d [d%d]\n", __FILE__, __LINE__, +#if defined (U_DEBUG_CAL) + fprintf(stderr, "%s:%d - was going to move JD from %d to %d [d%d]\n", __FILE__, __LINE__, julianDay, nextJulianDay, (nextJulianDay-julianDay)); -#endif +#endif julianDay = nextJulianDay; // recalculate 'first' [0-based local dow of jan 1] @@ -3357,7 +3349,7 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) { // recalculate date. date = 1 - first + dowLocal; } - } else if(woy>=getLeastMaximum(bestField)) { + } else if(woy>=getLeastMaximum(bestField)) { // could be in the last week- find out if this JD would overstep int32_t testDate = date; if ((7 - first) < getMinimalDaysInFirstWeek()) { @@ -3367,7 +3359,7 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) { // Now adjust for the week number. testDate += 7 * (woy - 1); -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "%s:%d - y=%d, y-1=%d doy%d, njd%d (C.F. %d)\n", __FILE__, __LINE__, year, year-1, testDate, julianDay+testDate, nextJulianDay); #endif @@ -3381,7 +3373,7 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) { } date = 1 - first + dowLocal; -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "%s:%d - date now %d, jd%d, ywoy%d\n", __FILE__, __LINE__, date, julianDay, year-1); #endif @@ -3406,13 +3398,13 @@ int32_t Calendar::handleComputeJulianDay(UCalendarDateFields bestField) { } int32_t -Calendar::getDefaultMonthInYear(int32_t /*eyear*/) +Calendar::getDefaultMonthInYear(int32_t /*eyear*/) { return 0; } int32_t -Calendar::getDefaultDayInMonth(int32_t /*eyear*/, int32_t /*month*/) +Calendar::getDefaultDayInMonth(int32_t /*eyear*/, int32_t /*month*/) { return 1; } @@ -3442,13 +3434,13 @@ int32_t Calendar::getLocalDOW() int32_t Calendar::handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t woy) { - // We have UCAL_YEAR_WOY and UCAL_WEEK_OF_YEAR - from those, determine + // We have UCAL_YEAR_WOY and UCAL_WEEK_OF_YEAR - from those, determine // what year we fall in, so that other code can set it properly. // (code borrowed from computeWeekFields and handleComputeJulianDay) //return yearWoy; // First, we need a reliable DOW. - UCalendarDateFields bestField = resolveFields(kDatePrecedence); // !! Note: if subclasses have a different table, they should override handleGetExtendedYearFromWeekFields + UCalendarDateFields bestField = resolveFields(kDatePrecedence); // !! Note: if subclasses have a different table, they should override handleGetExtendedYearFromWeekFields // Now, a local DOW int32_t dowLocal = getLocalDOW(); // 0..6 @@ -3481,9 +3473,9 @@ int32_t Calendar::handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t w int32_t minDays = getMinimalDaysInFirstWeek(); UBool jan1InPrevYear = FALSE; // January 1st in the year of WOY is the 1st week? (i.e. first week is < minimal ) - //UBool nextJan1InPrevYear = FALSE; // January 1st of Year of WOY + 1 is in the first week? + //UBool nextJan1InPrevYear = FALSE; // January 1st of Year of WOY + 1 is in the first week? - if((7 - first) < minDays) { + if((7 - first) < minDays) { jan1InPrevYear = TRUE; } @@ -3506,8 +3498,8 @@ int32_t Calendar::handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t w return yearWoy; // in this year } } - } else if(woy >= getLeastMaximum(bestField)) { - // we _might_ be in the last week.. + } else if(woy >= getLeastMaximum(bestField)) { + // we _might_ be in the last week.. int32_t jd = // Calculate JD of our target day: jan1Start + // JD of Jan 1 (7-first) + // days in the first week (Jan 1.. ) @@ -3544,7 +3536,7 @@ int32_t Calendar::handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t w } //(internalGet(UCAL_DATE) <= (7-first)) /* && in minDow */ ) { - //within 1st week and in this month.. + //within 1st week and in this month.. //return yearWoy+1; return yearWoy; @@ -3677,7 +3669,7 @@ void Calendar::prepareGetActual(UCalendarDateFields field, UBool isMinimum, UErr dow += 7; } } -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "prepareGetActualHelper(WOM/WOY) - dow=%d\n", dow); #endif set(UCAL_DAY_OF_WEEK, dow); @@ -3693,7 +3685,7 @@ void Calendar::prepareGetActual(UCalendarDateFields field, UBool isMinimum, UErr int32_t Calendar::getActualHelper(UCalendarDateFields field, int32_t startValue, int32_t endValue, UErrorCode &status) const { -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "getActualHelper(%d,%d .. %d, %s)\n", field, startValue, endValue, u_errorName(status)); #endif if (startValue == endValue) { @@ -3729,7 +3721,7 @@ int32_t Calendar::getActualHelper(UCalendarDateFields field, int32_t startValue, int32_t result = startValue; if ((work->get(field, status) != startValue && field != UCAL_WEEK_OF_MONTH && delta > 0 ) || U_FAILURE(status)) { -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "getActualHelper(fld %d) - got %d (not %d) - %s\n", field, work->get(field,status), startValue, u_errorName(status)); #endif } else { @@ -3746,7 +3738,7 @@ int32_t Calendar::getActualHelper(UCalendarDateFields field, int32_t startValue, } while (startValue != endValue); } delete work; -#if defined (U_DEBUG_CAL) +#if defined (U_DEBUG_CAL) fprintf(stderr, "getActualHelper(%d) = %d\n", field, result); #endif return result; @@ -3773,18 +3765,18 @@ Calendar::setWeekData(const Locale& desiredLocale, const char *type, UErrorCode& // Since week and weekend data is territory based instead of language based, // we may need to tweak the locale that we are using to try to get the appropriate // values, using the following logic: - // 1). If the locale has a language but no territory, use the territory as defined by + // 1). If the locale has a language but no territory, use the territory as defined by // the likely subtags. // 2). If the locale has a script designation then we ignore it, // then remove it ( i.e. "en_Latn_US" becomes "en_US" ) - + char minLocaleID[ULOC_FULLNAME_CAPACITY] = { 0 }; UErrorCode myStatus = U_ZERO_ERROR; uloc_minimizeSubtags(desiredLocale.getName(),minLocaleID,ULOC_FULLNAME_CAPACITY,&myStatus); Locale min = Locale::createFromName(minLocaleID); Locale useLocale; - if ( uprv_strlen(desiredLocale.getCountry()) == 0 || + if ( uprv_strlen(desiredLocale.getCountry()) == 0 || (uprv_strlen(desiredLocale.getScript()) > 0 && uprv_strlen(min.getScript()) == 0) ) { char maxLocaleID[ULOC_FULLNAME_CAPACITY] = { 0 }; myStatus = U_ZERO_ERROR; @@ -3794,8 +3786,8 @@ Calendar::setWeekData(const Locale& desiredLocale, const char *type, UErrorCode& } else { useLocale = Locale(desiredLocale); } - - /* The code here is somewhat of a hack, since week data and weekend data aren't really tied to + + /* The code here is somewhat of a hack, since week data and weekend data aren't really tied to a specific calendar, they aren't truly locale data. But this is the only place where valid and actual locale can be set, so we take a shot at it here by loading a representative resource from the calendar data. The code used to use the dateTimeElements resource to get first day @@ -3856,8 +3848,8 @@ Calendar::setWeekData(const Locale& desiredLocale, const char *type, UErrorCode& * and areFieldsSet. Callers should check isTimeSet and only * call this method if isTimeSet is false. */ -void -Calendar::updateTime(UErrorCode& status) +void +Calendar::updateTime(UErrorCode& status) { computeTime(status); if(U_FAILURE(status)) @@ -3866,14 +3858,14 @@ Calendar::updateTime(UErrorCode& status) // If we are lenient, we need to recompute the fields to normalize // the values. Also, if we haven't set all the fields yet (i.e., // in a newly-created object), we need to fill in the fields. [LIU] - if (isLenient() || ! fAreAllFieldsSet) + if (isLenient() || ! fAreAllFieldsSet) fAreFieldsSet = FALSE; fIsTimeSet = TRUE; fAreFieldsVirtuallySet = FALSE; } -Locale +Locale Calendar::getLocale(ULocDataLocaleType type, UErrorCode& status) const { U_LOCALE_BASED(locBased, *this); return locBased.getLocale(type, status); diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp index bac58b27ce9..e4ef1dbe8de 100644 --- a/icu4c/source/test/intltest/caltest.cpp +++ b/icu4c/source/test/intltest/caltest.cpp @@ -336,13 +336,6 @@ void CalendarTest::runIndexedTest( int32_t index, UBool exec, const char* &name, TestChineseCalendarMapping(); } break; - case 37: - name = "TestSettingHourOfDaySetsAmPm"; - if(exec) { - logln("TestSettingHourOfDaySetsAmPm---"); logln(""); - TestSettingHourOfDaySetsAmPm(); - } - break; default: name = ""; break; } } @@ -3716,44 +3709,6 @@ void CalendarTest::TestChineseCalendarMapping() { } } -void CalendarTest::TestSettingHourOfDaySetsAmPm() { - // Fix ticket 7700. - - UErrorCode status = U_ZERO_ERROR; - UDateFormat *fmt; - UCalendar *cal; - UChar pattern[2]; - UChar input[3]; - int32_t val; - int32_t parsepos = 0; - - u_uastrcpy(pattern, "K"); - u_uastrcpy(input, "10"); - - fmt = udat_open(UDAT_FULL, UDAT_FULL, NULL, NULL, 0, pattern, 1, &status); - udat_applyPattern(fmt, FALSE, pattern, 1); - - cal = ucal_open(0, -1, "", UCAL_GREGORIAN, &status); - - // Set time to PM. - ucal_set(cal, UCAL_AM_PM, 1); - - // Set HOUR_OF_DAY to 0 -- this should reset AM_PM to 0. - ucal_set(cal, UCAL_HOUR_OF_DAY, 0); - - // Parse "10" with "K" (hour 0-11). - udat_parseCalendar(fmt, - cal, - input, - 2, - &parsepos, - &status); - - // Want 10. Don't want 22. - val = ucal_get(cal, UCAL_HOUR_OF_DAY, &status); - TEST_ASSERT(val == 10); -} - #endif /* #if !UCONFIG_NO_FORMATTING */ //eof diff --git a/icu4c/source/test/intltest/caltest.h b/icu4c/source/test/intltest/caltest.h index e5652616e37..c47d67c960f 100644 --- a/icu4c/source/test/intltest/caltest.h +++ b/icu4c/source/test/intltest/caltest.h @@ -255,8 +255,6 @@ public: // package void TestAddAcrossZoneTransition(void); void TestChineseCalendarMapping(void); - - void TestSettingHourOfDaySetsAmPm(void); }; #endif /* #if !UCONFIG_NO_FORMATTING */