mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-05 21:45:37 +00:00
ICU-6157 date interval format
X-SVN-Rev: 24005
This commit is contained in:
Xiaomei Ji
parent
0c67eefa93
commit
f9a0590098
19 changed files with 5138 additions and 5 deletions
9
.gitattributes
vendored
9
.gitattributes
vendored
|
|
@ -48,14 +48,23 @@ README text !eol
|
|||
*.spp -text
|
||||
*.tri2 -text
|
||||
|
||||
icu4c/source/common/dtintrv.cpp -text
|
||||
icu4c/source/common/mutex.cpp -text
|
||||
icu4c/source/common/unicode/dtintrv.h -text
|
||||
icu4c/source/data/coll/ur.txt -text
|
||||
icu4c/source/data/coll/ur_IN.txt -text
|
||||
icu4c/source/data/coll/ur_PK.txt -text
|
||||
icu4c/source/data/xml/collation/ur.xml -text
|
||||
icu4c/source/i18n/dtitv_impl.h -text
|
||||
icu4c/source/i18n/dtitvfmt.cpp -text
|
||||
icu4c/source/i18n/dtitvinf.cpp -text
|
||||
icu4c/source/i18n/unicode/dtitvfmt.h -text
|
||||
icu4c/source/i18n/unicode/dtitvinf.h -text
|
||||
icu4c/source/samples/layout/cgnomelayout.c -text
|
||||
icu4c/source/samples/ucnv/data02.bin -text
|
||||
icu4c/source/test/compat/tzone.pl -text
|
||||
icu4c/source/test/intltest/dtifmtts.cpp -text
|
||||
icu4c/source/test/intltest/dtifmtts.h -text
|
||||
icu4c/source/test/perf/Makefile.in -text
|
||||
icu4c/source/test/perf/README -text
|
||||
icu4c/source/test/perf/strsrchperf/Makefile.in -text
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o triedict.o \
|
|||
rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o \
|
||||
serv.o servnotf.o servls.o servlk.o servlkf.o servrbf.o servslkf.o \
|
||||
uidna.o usprep.o punycode.o \
|
||||
util.o util_props.o parsepos.o locbased.o cwchar.o wintz.o mutex.o
|
||||
util.o util_props.o parsepos.o locbased.o cwchar.o wintz.o mutex.o dtintrv.o
|
||||
|
||||
## Header files to install
|
||||
HEADERS = $(srcdir)/unicode/*.h unicode/*.h
|
||||
|
|
|
|||
50
icu4c/source/common/dtintrv.cpp
Normal file
50
icu4c/source/common/dtintrv.cpp
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (C) 2008, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*
|
||||
* File DTINTRV.CPP
|
||||
*
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include "unicode/dtintrv.h"
|
||||
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DateInterval)
|
||||
|
||||
//DateInterval::DateInterval(){}
|
||||
|
||||
|
||||
DateInterval::DateInterval(const UDate from, const UDate to)
|
||||
: fromDate(from),
|
||||
toDate(to)
|
||||
{}
|
||||
|
||||
|
||||
DateInterval::~DateInterval(){}
|
||||
|
||||
|
||||
DateInterval::DateInterval(const DateInterval& other)
|
||||
: UObject(other) {
|
||||
*this = other;
|
||||
}
|
||||
|
||||
|
||||
DateInterval&
|
||||
DateInterval::operator=(const DateInterval& other) {
|
||||
if ( this != &other ) {
|
||||
fromDate = other.fromDate;
|
||||
toDate = other.toDate;
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
166
icu4c/source/common/unicode/dtintrv.h
Normal file
166
icu4c/source/common/unicode/dtintrv.h
Normal file
|
|
@ -0,0 +1,166 @@
|
|||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2008, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*
|
||||
* File DTINTRV.H
|
||||
*
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
#ifndef __DTINTRV_H__
|
||||
#define __DTINTRV_H__
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
#include "unicode/uobject.h"
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
|
||||
/**
|
||||
* This class represents date interval.
|
||||
* It is a pair of UDate representing from UDate 1 to UDate 2.
|
||||
* @draft ICU 4.0
|
||||
**/
|
||||
class U_COMMON_API DateInterval : public UObject {
|
||||
public:
|
||||
|
||||
/**
|
||||
* Constructor given from date and to date.
|
||||
* @param fromDate The from date in date interval.
|
||||
* @param toDate The to date in date interval.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateInterval(const UDate fromDate, const UDate toDate);
|
||||
|
||||
/**
|
||||
* destructor
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
~DateInterval();
|
||||
|
||||
/**
|
||||
* Get the from date.
|
||||
* @return the from date in dateInterval.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
UDate getFromDate() const;
|
||||
|
||||
/**
|
||||
* Get the to date.
|
||||
* @return the to date in dateInterval.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
UDate getToDate() const;
|
||||
|
||||
|
||||
/**
|
||||
* Return the class ID for this class. This is useful only for comparing to
|
||||
* a return value from getDynamicClassID(). For example:
|
||||
* <pre>
|
||||
* . Base* polymorphic_pointer = createPolymorphicObject();
|
||||
* . if (polymorphic_pointer->getDynamicClassID() ==
|
||||
* . erived::getStaticClassID()) ...
|
||||
* </pre>
|
||||
* @return The class ID for all objects of this class.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
static UClassID U_EXPORT2 getStaticClassID(void);
|
||||
|
||||
/**
|
||||
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override. This
|
||||
* method is to implement a simple version of RTTI, since not all C++
|
||||
* compilers support genuine RTTI. Polymorphic operator==() and clone()
|
||||
* methods call this method.
|
||||
*
|
||||
* @return The class ID for this object. All objects of a
|
||||
* given class have the same class ID. Objects of
|
||||
* other classes have different class IDs.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
virtual UClassID getDynamicClassID(void) const;
|
||||
|
||||
|
||||
/**
|
||||
* Copy constructor.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateInterval(const DateInterval& other);
|
||||
|
||||
/**
|
||||
* Default assignment operator
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateInterval& operator=(const DateInterval&);
|
||||
|
||||
/**
|
||||
* Equality operator.
|
||||
* @return TRUE if the two DateIntervals are the same
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
UBool operator==(const DateInterval& other) const;
|
||||
|
||||
/**
|
||||
* Non-equality operator
|
||||
* @return TRUE if the two DateIntervals are not the same
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
UBool operator!=(const DateInterval& other) const;
|
||||
|
||||
|
||||
/**
|
||||
* clone this object.
|
||||
* The caller owns the result and should delete it when done.
|
||||
* @return a cloned DateInterval
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateInterval* clone() const;
|
||||
|
||||
private:
|
||||
/**
|
||||
* Default constructor, not implemented.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateInterval();
|
||||
|
||||
UDate fromDate;
|
||||
UDate toDate;
|
||||
|
||||
} ;// end class DateInterval
|
||||
|
||||
|
||||
inline UDate
|
||||
DateInterval::getFromDate() const {
|
||||
return fromDate;
|
||||
}
|
||||
|
||||
|
||||
inline UDate
|
||||
DateInterval::getToDate() const {
|
||||
return toDate;
|
||||
}
|
||||
|
||||
|
||||
inline UBool
|
||||
DateInterval::operator==(const DateInterval& other) const {
|
||||
return ( fromDate == other.fromDate && toDate == other.toDate );
|
||||
}
|
||||
|
||||
|
||||
inline UBool
|
||||
DateInterval::operator!=(const DateInterval& other) const {
|
||||
return ( !operator==(other) );
|
||||
}
|
||||
|
||||
|
||||
inline DateInterval*
|
||||
DateInterval::clone() const {
|
||||
return new DateInterval(*this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
#endif
|
||||
|
|
@ -80,7 +80,7 @@ regexcmp.o rematch.o repattrn.o regexst.o udatpg.o uregex.o uregexc.o \
|
|||
ulocdata.o measfmt.o currfmt.o curramt.o currunit.o measure.o utmscale.o \
|
||||
csdetect.o csmatch.o csr2022.o csrecog.o csrmbcs.o csrsbcs.o csrucode.o csrutf8.o inputext.o \
|
||||
windtfmt.o winnmfmt.o basictz.o dtrule.o rbtz.o tzrule.o tztrans.o vtzone.o \
|
||||
zonemeta.o zstrfmt.o plurrule.o plurfmt.o
|
||||
zonemeta.o zstrfmt.o plurrule.o plurfmt.o dtitvfmt.o dtitvinf.o
|
||||
|
||||
## Header files to install
|
||||
HEADERS = $(srcdir)/unicode/*.h
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include "unicode/ures.h"
|
||||
#include "unicode/datefmt.h"
|
||||
#include "unicode/smpdtfmt.h"
|
||||
#include "unicode/dtptngen.h"
|
||||
#include "reldtfmt.h"
|
||||
|
||||
#include "cstring.h"
|
||||
|
|
@ -274,6 +275,36 @@ DateFormat::createInstance()
|
|||
return create(kShort, (EStyle) (kShort + kDateOffset), Locale::getDefault());
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
DateFormat* U_EXPORT2
|
||||
DateFormat::createInstance(const UnicodeString& skeleton,
|
||||
UBool adjustFieldWidth,
|
||||
const Locale& locale)
|
||||
{
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
|
||||
DateTimePatternGenerator* dtptg =
|
||||
DateTimePatternGenerator::createInstance(locale, status);
|
||||
if ( dtptg == NULL || U_FAILURE(status) ) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
delete dtptg;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// FIXME: use adjustFieldWidth later
|
||||
const UnicodeString pattern = dtptg->getBestPattern(skeleton, status);
|
||||
delete dtptg;
|
||||
if ( U_FAILURE(status) ) {
|
||||
return NULL;
|
||||
}
|
||||
SimpleDateFormat* dtfmt = new SimpleDateFormat(pattern, locale, status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
delete dtfmt;
|
||||
return NULL;
|
||||
}
|
||||
return dtfmt;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
DateFormat* U_EXPORT2
|
||||
|
|
|
|||
93
icu4c/source/i18n/dtitv_impl.h
Normal file
93
icu4c/source/i18n/dtitv_impl.h
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2007-2008, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*
|
||||
* File DTITV_IMPL.H
|
||||
*
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
|
||||
#ifndef DTITV_IMPL_H__
|
||||
#define DTITV_IMPL_H__
|
||||
|
||||
/**
|
||||
* \file
|
||||
* \brief C++ API: Defines macros for interval format implementation
|
||||
*/
|
||||
|
||||
#if !UCONFIG_NO_FORMATTING
|
||||
|
||||
#include "unicode/unistr.h"
|
||||
|
||||
|
||||
#define QUOTE ((UChar)0x0027)
|
||||
#define LOW_LINE ((UChar)0x005F)
|
||||
#define COLON ((UChar)0x003A)
|
||||
#define LEFT_CURLY_BRACKET ((UChar)0x007B)
|
||||
#define RIGHT_CURLY_BRACKET ((UChar)0x007D)
|
||||
#define SPACE ((UChar)0x0020)
|
||||
#define EN_DASH ((UChar)0x2013)
|
||||
|
||||
#define DIGIT_ZERO ((UChar)0x0030)
|
||||
#define DIGIT_ONE ((UChar)0x0031)
|
||||
|
||||
#define LOW_A ((UChar)0x0061)
|
||||
#define LOW_B ((UChar)0x0062)
|
||||
#define LOW_C ((UChar)0x0063)
|
||||
#define LOW_D ((UChar)0x0064)
|
||||
#define LOW_E ((UChar)0x0065)
|
||||
#define LOW_F ((UChar)0x0066)
|
||||
#define LOW_G ((UChar)0x0067)
|
||||
#define LOW_H ((UChar)0x0068)
|
||||
#define LOW_I ((UChar)0x0069)
|
||||
#define LOW_J ((UChar)0x006a)
|
||||
#define LOW_K ((UChar)0x006B)
|
||||
#define LOW_L ((UChar)0x006C)
|
||||
#define LOW_M ((UChar)0x006D)
|
||||
#define LOW_N ((UChar)0x006E)
|
||||
#define LOW_O ((UChar)0x006F)
|
||||
#define LOW_P ((UChar)0x0070)
|
||||
#define LOW_Q ((UChar)0x0071)
|
||||
#define LOW_R ((UChar)0x0072)
|
||||
#define LOW_S ((UChar)0x0073)
|
||||
#define LOW_T ((UChar)0x0074)
|
||||
#define LOW_U ((UChar)0x0075)
|
||||
#define LOW_V ((UChar)0x0076)
|
||||
#define LOW_W ((UChar)0x0077)
|
||||
#define LOW_Y ((UChar)0x0079)
|
||||
#define LOW_Z ((UChar)0x007A)
|
||||
|
||||
#define CAP_A ((UChar)0x0041)
|
||||
#define CAP_C ((UChar)0x0043)
|
||||
#define CAP_D ((UChar)0x0044)
|
||||
#define CAP_E ((UChar)0x0045)
|
||||
#define CAP_F ((UChar)0x0046)
|
||||
#define CAP_G ((UChar)0x0047)
|
||||
#define CAP_H ((UChar)0x0048)
|
||||
#define CAP_K ((UChar)0x004B)
|
||||
#define CAP_L ((UChar)0x004C)
|
||||
#define CAP_M ((UChar)0x004D)
|
||||
#define CAP_O ((UChar)0x004F)
|
||||
#define CAP_Q ((UChar)0x0051)
|
||||
#define CAP_S ((UChar)0x0053)
|
||||
#define CAP_T ((UChar)0x0054)
|
||||
#define CAP_V ((UChar)0x0056)
|
||||
#define CAP_W ((UChar)0x0057)
|
||||
#define CAP_Y ((UChar)0x0059)
|
||||
#define CAP_Z ((UChar)0x005A)
|
||||
|
||||
//#define MINIMUM_SUPPORTED_CALENDAR_FIELD UCAL_MINUTE
|
||||
|
||||
#define MAX_E_COUNT 5
|
||||
#define MAX_M_COUNT 5
|
||||
//#define MAX_INTERVAL_INDEX 4
|
||||
#define MAX_POSITIVE_INT 56632;
|
||||
|
||||
|
||||
#endif /* #if !UCONFIG_NO_FORMATTING */
|
||||
|
||||
#endif
|
||||
//eof
|
||||
1495
icu4c/source/i18n/dtitvfmt.cpp
Normal file
1495
icu4c/source/i18n/dtitvfmt.cpp
Normal file
File diff suppressed because it is too large
Load diff
583
icu4c/source/i18n/dtitvinf.cpp
Normal file
583
icu4c/source/i18n/dtitvinf.cpp
Normal file
|
|
@ -0,0 +1,583 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (C) 2008, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*
|
||||
* File DTITVINF.CPP
|
||||
*
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
|
||||
//FIXME: how to define it in compiler time
|
||||
//#define DTITVINF_DEBUG 0
|
||||
|
||||
|
||||
#ifdef DTITVINF_DEBUG
|
||||
#include <iostream>
|
||||
#endif
|
||||
|
||||
#include "cstring.h"
|
||||
#include "unicode/msgfmt.h"
|
||||
#include "unicode/dtitvinf.h"
|
||||
#include "dtitv_impl.h"
|
||||
|
||||
#if !UCONFIG_NO_FORMATTING
|
||||
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
|
||||
#ifdef DTITVINF_DEBUG
|
||||
#define PRINTMESG(msg) { std::cout << "(" << __FILE__ << ":" << __LINE__ << ") " << msg << "\n"; }
|
||||
#endif
|
||||
|
||||
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DateIntervalInfo)
|
||||
|
||||
static const char gIntervalDateTimePatternTag[]="IntervalDateTimePatterns";
|
||||
static const char gFallbackPatternTag[]="Fallback";
|
||||
|
||||
// {0}
|
||||
static const UChar gFirstPattern[] = {LEFT_CURLY_BRACKET, DIGIT_ZERO, RIGHT_CURLY_BRACKET, 0};
|
||||
// {1}
|
||||
static const UChar gSecondPattern[] = {LEFT_CURLY_BRACKET, DIGIT_ONE, RIGHT_CURLY_BRACKET, 0};
|
||||
|
||||
// default fall-back
|
||||
static const UChar gDefaultFallbackPattern[] = {LEFT_CURLY_BRACKET, DIGIT_ZERO, RIGHT_CURLY_BRACKET, SPACE, EN_DASH, SPACE, LEFT_CURLY_BRACKET, DIGIT_ONE, RIGHT_CURLY_BRACKET, 0};
|
||||
|
||||
|
||||
|
||||
DateIntervalInfo::DateIntervalInfo(UErrorCode& status)
|
||||
: fFallbackIntervalPattern(gDefaultFallbackPattern),
|
||||
fFirstDateInPtnIsLaterDate(false),
|
||||
fIntervalPatterns(NULL)
|
||||
{
|
||||
if ( U_FAILURE(status) ) {
|
||||
return;
|
||||
}
|
||||
fIntervalPatterns = initHash(status);
|
||||
}
|
||||
|
||||
|
||||
|
||||
DateIntervalInfo::DateIntervalInfo(const Locale& locale, UErrorCode& status)
|
||||
: fFallbackIntervalPattern(gDefaultFallbackPattern),
|
||||
fFirstDateInPtnIsLaterDate(false),
|
||||
fIntervalPatterns(NULL)
|
||||
{
|
||||
if ( U_FAILURE(status) ) {
|
||||
return;
|
||||
}
|
||||
initializeData(locale, status);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
DateIntervalInfo::setIntervalPattern(const UnicodeString& skeleton,
|
||||
UCalendarDateFields lrgDiffCalUnit,
|
||||
const UnicodeString& intervalPattern,
|
||||
UErrorCode& status) {
|
||||
if ( U_FAILURE(status) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ( lrgDiffCalUnit == UCAL_HOUR_OF_DAY ) {
|
||||
setIntervalPatternInternally(skeleton, UCAL_AM_PM, intervalPattern, status);
|
||||
setIntervalPatternInternally(skeleton, UCAL_HOUR, intervalPattern, status);
|
||||
} else if ( lrgDiffCalUnit == UCAL_DAY_OF_MONTH ||
|
||||
lrgDiffCalUnit == UCAL_DAY_OF_WEEK ) {
|
||||
setIntervalPatternInternally(skeleton, UCAL_DATE, intervalPattern, status);
|
||||
} else {
|
||||
setIntervalPatternInternally(skeleton, lrgDiffCalUnit, intervalPattern, status);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
DateIntervalInfo::setFallbackIntervalPattern(
|
||||
const UnicodeString& fallbackPattern) {
|
||||
int32_t firstPatternIndex = fallbackPattern.indexOf(gFirstPattern,
|
||||
sizeof(gFirstPattern)/sizeof(gFirstPattern[0]), 0);
|
||||
int32_t secondPatternIndex = fallbackPattern.indexOf(gSecondPattern,
|
||||
sizeof(gSecondPattern)/sizeof(gSecondPattern[0]), 0);
|
||||
if ( firstPatternIndex > secondPatternIndex ) {
|
||||
fFirstDateInPtnIsLaterDate = true;
|
||||
}
|
||||
fFallbackIntervalPattern = fallbackPattern;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DateIntervalInfo::DateIntervalInfo(const DateIntervalInfo& dtitvinf)
|
||||
: UObject(dtitvinf),
|
||||
fIntervalPatterns(NULL)
|
||||
{
|
||||
*this = dtitvinf;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DateIntervalInfo&
|
||||
DateIntervalInfo::operator=(const DateIntervalInfo& dtitvinf) {
|
||||
if ( this == &dtitvinf ) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
deleteHash(fIntervalPatterns);
|
||||
fIntervalPatterns = initHash(status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
return *this;
|
||||
}
|
||||
copyHash(dtitvinf.fIntervalPatterns, fIntervalPatterns, status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
return *this;
|
||||
}
|
||||
|
||||
fFallbackIntervalPattern = dtitvinf.fFallbackIntervalPattern;
|
||||
fFirstDateInPtnIsLaterDate = dtitvinf.fFirstDateInPtnIsLaterDate;
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
DateIntervalInfo*
|
||||
DateIntervalInfo::clone() const {
|
||||
return new DateIntervalInfo(*this);
|
||||
}
|
||||
|
||||
|
||||
DateIntervalInfo::~DateIntervalInfo() {
|
||||
deleteHash(fIntervalPatterns);
|
||||
fIntervalPatterns = NULL;
|
||||
}
|
||||
|
||||
|
||||
UBool
|
||||
DateIntervalInfo::operator==(const DateIntervalInfo& other) const {
|
||||
UBool equal = (
|
||||
fFallbackIntervalPattern == other.fFallbackIntervalPattern &&
|
||||
fFirstDateInPtnIsLaterDate == other.fFirstDateInPtnIsLaterDate );
|
||||
|
||||
if ( equal == TRUE ) {
|
||||
equal = fIntervalPatterns->equals(*(other.fIntervalPatterns));
|
||||
}
|
||||
|
||||
return equal;
|
||||
}
|
||||
|
||||
|
||||
const UnicodeString*
|
||||
DateIntervalInfo::getIntervalPattern(const UnicodeString& skeleton,
|
||||
UCalendarDateFields field,
|
||||
UErrorCode& status) const {
|
||||
if ( U_FAILURE(status) ) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const UnicodeString* patternsOfOneSkeleton = (UnicodeString*) fIntervalPatterns->get(skeleton);
|
||||
if ( patternsOfOneSkeleton != NULL ) {
|
||||
int8_t index = (int8_t)calendarFieldToIntervalIndex(field, status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
return NULL;
|
||||
}
|
||||
const UnicodeString& intervalPattern = patternsOfOneSkeleton[index];
|
||||
if ( !intervalPattern.isEmpty() ) {
|
||||
return &intervalPattern;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
DateIntervalInfo::initializeData(const Locale& locale, UErrorCode& status)
|
||||
{
|
||||
fIntervalPatterns = initHash(status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
return;
|
||||
}
|
||||
CalendarData* calData = new CalendarData(locale, NULL, status);
|
||||
if ( calData == NULL ) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
const UResourceBundle* itvDtPtnResource = calData->getByKey(
|
||||
gIntervalDateTimePatternTag, status);
|
||||
|
||||
// look for fallback first, since it establishes the default order
|
||||
const UChar* resStr;
|
||||
int32_t resStrLen = 0;
|
||||
resStr = ures_getStringByKeyWithFallback(itvDtPtnResource,
|
||||
gFallbackPatternTag,
|
||||
&resStrLen, &status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
delete calData;
|
||||
return;
|
||||
}
|
||||
|
||||
UnicodeString pattern = UnicodeString(TRUE, resStr, resStrLen);
|
||||
setFallbackIntervalPattern(pattern);
|
||||
|
||||
int32_t size = ures_getSize(itvDtPtnResource);
|
||||
int32_t index;
|
||||
for ( index = 0; index < size; ++index ) {
|
||||
UResourceBundle* oneRes = ures_getByIndex(itvDtPtnResource, index,
|
||||
NULL, &status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
delete calData;
|
||||
return;
|
||||
}
|
||||
|
||||
const char* skeleton = ures_getKey(oneRes);
|
||||
ures_close(oneRes);
|
||||
if ( skeleton == NULL ) {
|
||||
status = U_MISSING_RESOURCE_ERROR;
|
||||
delete calData;
|
||||
return;
|
||||
}
|
||||
if ( uprv_strcmp(skeleton, gFallbackPatternTag) == 0 ) {
|
||||
continue; // fallback
|
||||
}
|
||||
|
||||
UResourceBundle* intervalPatterns = ures_getByKey(itvDtPtnResource,
|
||||
skeleton, NULL, &status);
|
||||
|
||||
if ( U_FAILURE(status) ) {
|
||||
delete calData;
|
||||
return;
|
||||
}
|
||||
|
||||
// return if interval patterns for skeleton not found
|
||||
if ( intervalPatterns == NULL ) {
|
||||
status = U_MISSING_RESOURCE_ERROR;
|
||||
delete calData;
|
||||
return;
|
||||
}
|
||||
|
||||
const UChar* pattern;
|
||||
const char* key;
|
||||
int32_t ptLength;
|
||||
int32_t ptnNum = ures_getSize(intervalPatterns);
|
||||
int32_t ptnIndex;
|
||||
for ( ptnIndex = 0; ptnIndex < ptnNum; ++ptnIndex ) {
|
||||
pattern = ures_getNextString(intervalPatterns, &ptLength, &key,
|
||||
&status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
delete calData;
|
||||
return;
|
||||
}
|
||||
|
||||
UCalendarDateFields calendarField = UCAL_FIELD_COUNT;
|
||||
if ( !uprv_strcmp(key, "y") ) {
|
||||
calendarField = UCAL_YEAR;
|
||||
} else if ( !uprv_strcmp(key, "M") ) {
|
||||
calendarField = UCAL_MONTH;
|
||||
} else if ( !uprv_strcmp(key, "d") ) {
|
||||
calendarField = UCAL_DATE;
|
||||
} else if ( !uprv_strcmp(key, "a") ) {
|
||||
calendarField = UCAL_AM_PM;
|
||||
} else if ( !uprv_strcmp(key, "h") ) {
|
||||
calendarField = UCAL_HOUR;
|
||||
} else if ( !uprv_strcmp(key, "m") ) {
|
||||
calendarField = UCAL_MINUTE;
|
||||
}
|
||||
if ( calendarField != UCAL_FIELD_COUNT ) {
|
||||
setIntervalPatternInternally(skeleton, calendarField, pattern,status);
|
||||
}
|
||||
}
|
||||
ures_close(intervalPatterns);
|
||||
}
|
||||
delete calData;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
DateIntervalInfo::setIntervalPatternInternally(const UnicodeString& skeleton,
|
||||
UCalendarDateFields lrgDiffCalUnit,
|
||||
const UnicodeString& intervalPattern,
|
||||
UErrorCode& status) {
|
||||
int8_t index = (int8_t)calendarFieldToIntervalIndex(lrgDiffCalUnit,status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
return;
|
||||
}
|
||||
UnicodeString* patternsOfOneSkeleton = (UnicodeString*)(fIntervalPatterns->get(skeleton));
|
||||
UBool emptyHash = false;
|
||||
if ( patternsOfOneSkeleton == NULL ) {
|
||||
patternsOfOneSkeleton = new UnicodeString[kIPI_MAX_INDEX];
|
||||
emptyHash = true;
|
||||
}
|
||||
|
||||
patternsOfOneSkeleton[index] = intervalPattern;
|
||||
if ( emptyHash == TRUE ) {
|
||||
fIntervalPatterns->put(skeleton, patternsOfOneSkeleton, status);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
DateIntervalInfo::parseSkeleton(const UnicodeString& skeleton,
|
||||
int32_t* skeletonFieldWidth) {
|
||||
const int8_t PATTERN_CHAR_BASE = 0x41;
|
||||
int32_t i;
|
||||
for ( i = 0; i < skeleton.length(); ++i ) {
|
||||
// it is an ASCII char in skeleton
|
||||
int8_t ch = (int8_t)skeleton.charAt(i);
|
||||
++skeletonFieldWidth[ch - PATTERN_CHAR_BASE];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
UBool
|
||||
DateIntervalInfo::stringNumeric(int32_t fieldWidth, int32_t anotherFieldWidth,
|
||||
char patternLetter) {
|
||||
if ( patternLetter == 'M' ) {
|
||||
if ( fieldWidth <= 2 && anotherFieldWidth > 2 ||
|
||||
fieldWidth > 2 && anotherFieldWidth <= 2 ) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
const UnicodeString*
|
||||
DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton,
|
||||
int8_t& bestMatchDistanceInfo) const {
|
||||
#ifdef DTITVINF_DEBUG
|
||||
char result[1000];
|
||||
char result_1[1000];
|
||||
char mesg[2000];
|
||||
skeleton.extract(0, skeleton.length(), result, "UTF-8");
|
||||
sprintf(mesg, "in getBestSkeleton: skeleton: %s; \n", result);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
|
||||
|
||||
int32_t inputSkeletonFieldWidth[] =
|
||||
{
|
||||
// A B C D E F G H I J K L M N O
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
// P Q R S T U V W X Y Z
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
// a b c d e f g h i j k l m n o
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
// p q r s t u v w x y z
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
|
||||
int32_t skeletonFieldWidth[] =
|
||||
{
|
||||
// A B C D E F G H I J K L M N O
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
// P Q R S T U V W X Y Z
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
// a b c d e f g h i j k l m n o
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
// p q r s t u v w x y z
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
|
||||
const int32_t DIFFERENT_FIELD = 0x1000;
|
||||
const int32_t STRING_NUMERIC_DIFFERENCE = 0x100;
|
||||
const int32_t BASE = 0x41;
|
||||
|
||||
// hack for 'v' and 'z'.
|
||||
// resource bundle only have time skeletons ending with 'v',
|
||||
// but not for time skeletons ending with 'z'.
|
||||
UBool replaceZWithV = false;
|
||||
const UnicodeString* inputSkeleton = &skeleton;
|
||||
UnicodeString copySkeleton;
|
||||
if ( skeleton.indexOf('z') != -1 ) {
|
||||
copySkeleton = skeleton;
|
||||
copySkeleton.findAndReplace("z", "v");
|
||||
inputSkeleton = ©Skeleton;
|
||||
replaceZWithV = true;
|
||||
}
|
||||
|
||||
parseSkeleton(*inputSkeleton, inputSkeletonFieldWidth);
|
||||
int32_t bestDistance = MAX_POSITIVE_INT;
|
||||
const UnicodeString* bestSkeleton = NULL;
|
||||
|
||||
// 0 means exact the same skeletons;
|
||||
// 1 means having the same field, but with different length,
|
||||
// 2 means only z/v differs
|
||||
// -1 means having different field.
|
||||
bestMatchDistanceInfo = 0;
|
||||
int8_t fieldLength = sizeof(skeletonFieldWidth)/sizeof(skeletonFieldWidth[0]);
|
||||
|
||||
int32_t pos = -1;
|
||||
const UHashElement* elem = NULL;
|
||||
while ( (elem = fIntervalPatterns->nextElement(pos)) != NULL ) {
|
||||
const UHashTok keyTok = elem->key;
|
||||
UnicodeString* skeleton = (UnicodeString*)keyTok.pointer;
|
||||
#ifdef DTITVINF_DEBUG
|
||||
skeleton->extract(0, skeleton->length(), result, "UTF-8");
|
||||
sprintf(mesg, "available skeletons: skeleton: %s; \n", result);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
|
||||
// clear skeleton field width
|
||||
int8_t i;
|
||||
for ( i = 0; i < fieldLength; ++i ) {
|
||||
skeletonFieldWidth[i] = 0;
|
||||
}
|
||||
parseSkeleton(*skeleton, skeletonFieldWidth);
|
||||
// calculate distance
|
||||
int32_t distance = 0;
|
||||
int8_t fieldDifference = 1;
|
||||
for ( i = 0; i < fieldLength; ++i ) {
|
||||
int32_t inputFieldWidth = inputSkeletonFieldWidth[i];
|
||||
int32_t fieldWidth = skeletonFieldWidth[i];
|
||||
if ( inputFieldWidth == fieldWidth ) {
|
||||
continue;
|
||||
}
|
||||
if ( inputFieldWidth == 0 ) {
|
||||
fieldDifference = -1;
|
||||
distance += DIFFERENT_FIELD;
|
||||
} else if ( fieldWidth == 0 ) {
|
||||
fieldDifference = -1;
|
||||
distance += DIFFERENT_FIELD;
|
||||
} else if (stringNumeric(inputFieldWidth, fieldWidth,
|
||||
(char)(i+BASE) ) ) {
|
||||
distance += STRING_NUMERIC_DIFFERENCE;
|
||||
} else {
|
||||
distance += (inputFieldWidth > fieldWidth) ?
|
||||
(inputFieldWidth - fieldWidth) :
|
||||
(fieldWidth - inputFieldWidth);
|
||||
}
|
||||
}
|
||||
if ( distance < bestDistance ) {
|
||||
bestSkeleton = skeleton;
|
||||
bestDistance = distance;
|
||||
bestMatchDistanceInfo = fieldDifference;
|
||||
}
|
||||
if ( distance == 0 ) {
|
||||
bestMatchDistanceInfo = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ( replaceZWithV && bestMatchDistanceInfo != -1 ) {
|
||||
bestMatchDistanceInfo = 2;
|
||||
}
|
||||
return bestSkeleton;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DateIntervalInfo::IntervalPatternIndex
|
||||
DateIntervalInfo::calendarFieldToIntervalIndex(UCalendarDateFields field,
|
||||
UErrorCode& status) {
|
||||
IntervalPatternIndex index = kIPI_ERA;
|
||||
switch ( field ) {
|
||||
case UCAL_ERA:
|
||||
break;
|
||||
case UCAL_YEAR:
|
||||
index = kIPI_YEAR;
|
||||
break;
|
||||
case UCAL_MONTH:
|
||||
index = kIPI_MONTH;
|
||||
break;
|
||||
case UCAL_DATE:
|
||||
case UCAL_DAY_OF_WEEK:
|
||||
//case UCAL_DAY_OF_MONTH:
|
||||
index = kIPI_DATE;
|
||||
break;
|
||||
case UCAL_AM_PM:
|
||||
index = kIPI_AM_PM;
|
||||
break;
|
||||
case UCAL_HOUR:
|
||||
case UCAL_HOUR_OF_DAY:
|
||||
index = kIPI_HOUR;
|
||||
break;
|
||||
case UCAL_MINUTE:
|
||||
index = kIPI_MINUTE;
|
||||
break;
|
||||
default:
|
||||
status = U_ILLEGAL_ARGUMENT_ERROR;
|
||||
}
|
||||
return index;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
DateIntervalInfo::deleteHash(Hashtable* hTable)
|
||||
{
|
||||
if ( hTable == NULL ) {
|
||||
return;
|
||||
}
|
||||
int32_t pos = -1;
|
||||
const UHashElement* element = NULL;
|
||||
while ( (element = hTable->nextElement(pos)) != NULL ) {
|
||||
const UHashTok keyTok = element->key;
|
||||
const UHashTok valueTok = element->value;
|
||||
const UnicodeString* value = (UnicodeString*)valueTok.pointer;
|
||||
delete[] value;
|
||||
}
|
||||
delete fIntervalPatterns;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Hashtable*
|
||||
DateIntervalInfo::initHash(UErrorCode& status) {
|
||||
|
||||
Hashtable* hTable;
|
||||
if ( (hTable = new Hashtable(TRUE, status)) == NULL ) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return NULL;
|
||||
}
|
||||
hTable->setValueCompartor(hashTableValueComparator);
|
||||
return hTable;
|
||||
}
|
||||
|
||||
|
||||
UBool
|
||||
DateIntervalInfo::hashTableValueComparator(UHashTok val1, UHashTok val2) {
|
||||
const UnicodeString* pattern1 = (UnicodeString*)val1.pointer;
|
||||
const UnicodeString* pattern2 = (UnicodeString*)val2.pointer;
|
||||
UBool ret = TRUE;
|
||||
int8_t i;
|
||||
for ( i = 0; i < kIPI_MAX_INDEX && ret == TRUE; ++i ) {
|
||||
ret = (pattern1[i] == pattern2[i]);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
DateIntervalInfo::copyHash(const Hashtable* source,
|
||||
Hashtable* target,
|
||||
UErrorCode& status) {
|
||||
int32_t pos = -1;
|
||||
const UHashElement* element = NULL;
|
||||
if ( source ) {
|
||||
while ( (element = source->nextElement(pos)) != NULL ) {
|
||||
const UHashTok keyTok = element->key;
|
||||
const UnicodeString* key = (UnicodeString*)keyTok.pointer;
|
||||
const UHashTok valueTok = element->value;
|
||||
const UnicodeString* value = (UnicodeString*)valueTok.pointer;
|
||||
UnicodeString* copy = new UnicodeString[kIPI_MAX_INDEX];
|
||||
int8_t i;
|
||||
for ( i = 0; i < kIPI_MAX_INDEX; ++i ) {
|
||||
copy[i] = value[i];
|
||||
}
|
||||
target->put(UnicodeString(*key), copy, status);
|
||||
if ( U_FAILURE(status) ) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
#endif
|
||||
|
|
@ -65,6 +65,8 @@
|
|||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
static const UChar PATTERN_CHAR_BASE = 0x40;
|
||||
|
||||
/**
|
||||
* Last-resort string to use for "GMT" when constructing time zone strings.
|
||||
*/
|
||||
|
|
@ -580,6 +582,38 @@ SimpleDateFormat::format(const Formattable& obj,
|
|||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
/* Map calendar field into calendar field level.
|
||||
* the larger the level, the smaller the field unit.
|
||||
* For example, UCAL_ERA level is 0, UCAL_YEAR level is 10,
|
||||
* UCAL_MONTH level is 20.
|
||||
*/
|
||||
const int32_t
|
||||
SimpleDateFormat::fgCalendarFieldToLevel[] =
|
||||
{
|
||||
/*GyM*/ 0, 10, 20,
|
||||
/*wW*/ 20, 30,
|
||||
/*dDEF*/ 30, 20, 30, 30,
|
||||
/*ahHm*/ 40, 50, 50, 60,
|
||||
/*sS..*/ 70, 80,
|
||||
/*z?Y*/ 0, 0, 10,
|
||||
/*eug*/ 30, 10, 0,
|
||||
/*A*/ 40
|
||||
};
|
||||
|
||||
|
||||
const int32_t
|
||||
SimpleDateFormat::fgPatternCharToLevel[] = {
|
||||
// A B C D E F G H I J K L M N O
|
||||
-1, 40, -1, -1, 20, 30, 30, 0, 50, -1, -1, 50, 20, 20, -1, -1,
|
||||
// P Q R S T U V W X Y Z
|
||||
-1, 20, -1, 80, -1, -1, 0, 30, -1, 10, 0, -1, -1, -1, -1, -1,
|
||||
// a b c d e f g h i j k l m n o
|
||||
-1, 40, -1, 30, 30, 30, -1, 0, 50, -1, -1, 50, -1, 60, -1, -1,
|
||||
// p q r s t u v w x y z
|
||||
-1, 20, -1, 70, -1, 10, 0, 20, -1, 10, 0, -1, -1, -1, -1, -1
|
||||
};
|
||||
|
||||
|
||||
// Map index into pattern character string to Calendar field number.
|
||||
const UCalendarDateFields
|
||||
SimpleDateFormat::fgPatternIndexToCalendarField[] =
|
||||
|
|
@ -2427,6 +2461,67 @@ void SimpleDateFormat::adoptCalendar(Calendar* calendarToAdopt)
|
|||
initializeDefaultCentury(); // we need a new century (possibly)
|
||||
}
|
||||
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
|
||||
UBool
|
||||
SimpleDateFormat::isFieldUnitIgnored(UCalendarDateFields field) const {
|
||||
return isFieldUnitIgnored(fPattern, field);
|
||||
}
|
||||
|
||||
|
||||
UBool
|
||||
SimpleDateFormat::isFieldUnitIgnored(const UnicodeString& pattern,
|
||||
UCalendarDateFields field) {
|
||||
int32_t fieldLevel = fgCalendarFieldToLevel[field];
|
||||
int32_t level;
|
||||
UChar ch;
|
||||
UBool inQuote = FALSE;
|
||||
UChar prevCh = 0;
|
||||
int32_t count = 0;
|
||||
|
||||
for (int32_t i = 0; i < pattern.length(); ++i) {
|
||||
ch = pattern[i];
|
||||
if (ch != prevCh && count > 0) {
|
||||
level = fgPatternCharToLevel[prevCh - PATTERN_CHAR_BASE];
|
||||
if ( fieldLevel <= level ) {
|
||||
return FALSE;
|
||||
}
|
||||
count = 0;
|
||||
}
|
||||
if (ch == QUOTE) {
|
||||
if ((i+1) < pattern.length() && pattern[i+1] == QUOTE) {
|
||||
++i;
|
||||
} else {
|
||||
inQuote = ! inQuote;
|
||||
}
|
||||
}
|
||||
else if ( ! inQuote && ((ch >= 0x0061 /*'a'*/ && ch <= 0x007A /*'z'*/)
|
||||
|| (ch >= 0x0041 /*'A'*/ && ch <= 0x005A /*'Z'*/))) {
|
||||
prevCh = ch;
|
||||
++count;
|
||||
}
|
||||
}
|
||||
if ( count > 0 ) {
|
||||
// last item
|
||||
level = fgPatternCharToLevel[prevCh - PATTERN_CHAR_BASE];
|
||||
if ( fieldLevel <= level ) {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
const Locale&
|
||||
SimpleDateFormat::getSmpFmtLocale(void) const {
|
||||
return fLocale;
|
||||
}
|
||||
|
||||
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
#endif /* #if !UCONFIG_NO_FORMATTING */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
********************************************************************************
|
||||
* Copyright (C) 1997-2007, International Business Machines
|
||||
* Copyright (C) 1997-2008, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
********************************************************************************
|
||||
*
|
||||
|
|
@ -413,6 +413,33 @@ public:
|
|||
*/
|
||||
static DateFormat* U_EXPORT2 createInstance(void);
|
||||
|
||||
/**
|
||||
* Create a date/time formatter from skeleton and a given locale.
|
||||
*
|
||||
* Users are encouraged to use the skeleton macros defined in udat.h.
|
||||
* For example, MONTH_DOW_DAY_LONG_FORMAT, which is "MMMMEEEEd",
|
||||
* and which means the pattern should have day, month, and day-of-week
|
||||
* fields, and follow the long date format defined in date time pattern.
|
||||
* For example, for English, the full pattern should be
|
||||
* "EEEE, MMMM d".
|
||||
*
|
||||
* Temporarily, this is an internal API, used by DateIntevalFormat only.
|
||||
* There will be a new set of APIs for the same purpose coming soon.
|
||||
* After which, this API will be replaced.
|
||||
*
|
||||
* @param skeleton the skeleton on which date format based.
|
||||
* @param adjustFieldWidth whether adjust the skeleton field width or not.
|
||||
* It is used for DateTimePatternGenerator to
|
||||
* adjust field width when get
|
||||
* full pattern from skeleton.
|
||||
* @param locale the given locale.
|
||||
* @return a simple date formatter which the caller owns.
|
||||
* @internal ICU 4.0
|
||||
*/
|
||||
static DateFormat* U_EXPORT2 createInstance(const UnicodeString& skeleton,
|
||||
UBool adjustFieldWidth,
|
||||
const Locale& locale);
|
||||
|
||||
/**
|
||||
* Creates a time formatter with the given formatting style for the given
|
||||
* locale.
|
||||
|
|
|
|||
1303
icu4c/source/i18n/unicode/dtitvfmt.h
Normal file
1303
icu4c/source/i18n/unicode/dtitvfmt.h
Normal file
File diff suppressed because it is too large
Load diff
541
icu4c/source/i18n/unicode/dtitvinf.h
Normal file
541
icu4c/source/i18n/unicode/dtitvinf.h
Normal file
|
|
@ -0,0 +1,541 @@
|
|||
/*
|
||||
*******************************************************************************
|
||||
* Copyright (C) 2008, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*
|
||||
* File DTITVINF.H
|
||||
*
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
#ifndef __DTITVINF_H__
|
||||
#define __DTITVINF_H__
|
||||
|
||||
/**
|
||||
* \file
|
||||
* \brief C++ API: Date/Time interval patterns for formatting date/time interval
|
||||
*/
|
||||
|
||||
#if !UCONFIG_NO_FORMATTING
|
||||
|
||||
#include "hash.h"
|
||||
#include "gregoimp.h"
|
||||
#include "uresimp.h"
|
||||
#include "unicode/utypes.h"
|
||||
#include "unicode/udat.h"
|
||||
#include "unicode/locid.h"
|
||||
#include "unicode/ucal.h"
|
||||
#include "unicode/dtptngen.h"
|
||||
//#include "dtitv_impl.h"
|
||||
|
||||
|
||||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* DateIntervalInfo is a public class for encapsulating localizable
|
||||
* date time interval patterns. It is used by DateIntervalFormat.
|
||||
*
|
||||
* <P>
|
||||
* Logically, the interval patterns are mappings
|
||||
* from (skeleton, the_largest_different_calendar_field)
|
||||
* to (date_interval_pattern).
|
||||
*
|
||||
* <P>
|
||||
* A skeleton
|
||||
* <ol>
|
||||
* <li>
|
||||
* only keeps the field pattern letter and ignores all other parts
|
||||
* in a pattern, such as space, punctuations, and string literals.
|
||||
* <li>
|
||||
* hides the order of fields.
|
||||
* <li>
|
||||
* might hide a field's pattern letter length.
|
||||
*
|
||||
* For those non-digit calendar fields, the pattern letter length is
|
||||
* important, such as MMM, MMMM, and MMMMM; EEE and EEEE,
|
||||
* and the field's pattern letter length is honored.
|
||||
*
|
||||
* For the digit calendar fields, such as M or MM, d or dd, yy or yyyy,
|
||||
* the field pattern length is ignored and the best match, which is defined
|
||||
* in date time patterns, will be returned without honor the field pattern
|
||||
* letter length in skeleton.
|
||||
* </ol>
|
||||
*
|
||||
* <P>
|
||||
* There is a set of pre-defined static skeleton strings.
|
||||
* The skeletons defined consist of the desired calendar field set
|
||||
* (for example, DAY, MONTH, YEAR) and the format length (long, medium, short)
|
||||
* used in date time patterns.
|
||||
*
|
||||
* For example, skeleton YEAR_MONTH_MEDIUM_FORMAT consists month and year,
|
||||
* and it's corresponding full pattern is medium format date pattern.
|
||||
* So, the skeleton is "yMMM", for English, the full pattern is "MMM yyyy",
|
||||
* which is the format by removing DATE from medium date format.
|
||||
*
|
||||
* For example, skeleton YEAR_MONTH_DOW_DAY_MEDIUM_FORMAT consists day, month,
|
||||
* year, and day-of-week, and it's corresponding full pattern is the medium
|
||||
* format date pattern. So, the skeleton is "yMMMEEEd", for English,
|
||||
* the full pattern is "EEE, MMM d, yyyy", which is the medium date format
|
||||
* plus day-of-week.
|
||||
*
|
||||
* <P>
|
||||
* The calendar fields we support for interval formatting are:
|
||||
* year, month, date, day-of-week, am-pm, hour, hour-of-day, and minute.
|
||||
* Those calendar fields can be defined in the following order:
|
||||
* year > month > date > am-pm > hour > minute
|
||||
*
|
||||
* The largest different calendar fields between 2 calendars is the
|
||||
* first different calendar field in above order.
|
||||
*
|
||||
* For example: the largest different calendar fields between "Jan 10, 2007"
|
||||
* and "Feb 20, 2008" is year.
|
||||
*
|
||||
* <P>
|
||||
* There are pre-defined interval patterns for those pre-defined skeletons
|
||||
* in locales' resource files.
|
||||
* For example, for a skeleton YEAR_MONTH_DAY_MEDIUM_FORMAT, which is "yMMMd",
|
||||
* in en_US, if the largest different calendar field between date1 and date2
|
||||
* is "year", the date interval pattern is "MMM d, yyyy - MMM d, yyyy",
|
||||
* such as "Jan 10, 2007 - Jan 10, 2008".
|
||||
* If the largest different calendar field between date1 and date2 is "month",
|
||||
* the date interval pattern is "MMM d - MMM d, yyyy",
|
||||
* such as "Jan 10 - Feb 10, 2007".
|
||||
* If the largest different calendar field between date1 and date2 is "day",
|
||||
* the date interval pattern is ""MMM d-d, yyyy", such as "Jan 10-20, 2007".
|
||||
*
|
||||
* For date skeleton, the interval patterns when year, or month, or date is
|
||||
* different are defined in resource files.
|
||||
* For time skeleton, the interval patterns when am/pm, or hour, or minute is
|
||||
* different are defined in resource files.
|
||||
*
|
||||
*
|
||||
* <P>
|
||||
* There are 2 dates in interval pattern. For most locales, the first date
|
||||
* in an interval pattern is the earlier date. There might be a locale in which
|
||||
* the first date in an interval pattern is the later date.
|
||||
* We use fallback format for the default order for the locale.
|
||||
* For example, if the fallback format is "{0} - {1}", it means
|
||||
* the first date in the interval pattern for this locale is earlier date.
|
||||
* If the fallback format is "{1} - {0}", it means the first date is the
|
||||
* later date.
|
||||
* For a paticular interval pattern, the default order can be overriden
|
||||
* by prefixing "latestFirst:" or "earliestFirst:" to the interval pattern.
|
||||
* For example, if the fallback format is "{0}-{1}",
|
||||
* but for skeleton "yMMMd", the interval pattern when day is different is
|
||||
* "latestFirst:d-d MMM yy", it means by default, the first date in interval
|
||||
* pattern is the earlier date. But for skeleton "yMMMd", when day is different,
|
||||
* the first date in "d-d MMM yy" is the later date.
|
||||
*
|
||||
* <P>
|
||||
* The recommended way to create a DateIntervalFormat object is to pass in
|
||||
* the locale.
|
||||
* By using a Locale parameter, the DateIntervalFormat object is
|
||||
* initialized with the pre-defined interval patterns for a given or
|
||||
* default locale.
|
||||
* <P>
|
||||
* Users can also create DateIntervalFormat object
|
||||
* by supplying their own interval patterns.
|
||||
* It provides flexibility for powerful usage.
|
||||
*
|
||||
* <P>
|
||||
* After a DateIntervalInfo object is created, clients may modify
|
||||
* the interval patterns using setIntervalPattern function as so desired.
|
||||
* Currently, users can only set interval patterns when the following
|
||||
* calendar fields are different: ERA, YEAR, MONTH, DATE, DAY_OF_MONTH,
|
||||
* DAY_OF_WEEK, AM_PM, HOUR, HOUR_OF_DAY, and MINUTE.
|
||||
* Interval patterns when other calendar fields are different is not supported.
|
||||
* <P>
|
||||
* DateIntervalInfo objects are clonable.
|
||||
* When clients obtain a DateIntervalInfo object,
|
||||
* they can feel free to modify it as necessary.
|
||||
* <P>
|
||||
* DateIntervalInfo are not expected to be subclassed.
|
||||
* Data for a calendar is loaded out of resource bundles.
|
||||
* To ICU 4.0, date interval patterns are only supported in Gregorian calendar.
|
||||
* @draft ICU 4.0
|
||||
**/
|
||||
|
||||
class U_I18N_API DateIntervalInfo : public UObject {
|
||||
public:
|
||||
/**
|
||||
* Default constructor.
|
||||
* It does not initialize any interval patterns.
|
||||
* It should be followed by setFallbackIntervalPattern() and
|
||||
* setIntervalPattern(),
|
||||
* and is recommended to be used only for powerful users who
|
||||
* wants to create their own interval patterns and use them to create
|
||||
* date interval formatter.
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @internal ICU 4.0
|
||||
*/
|
||||
DateIntervalInfo(UErrorCode& status);
|
||||
|
||||
|
||||
/**
|
||||
* Construct DateIntervalInfo for the given locale,
|
||||
* @param locale the interval patterns are loaded from the Gregorian
|
||||
* calendar data in this locale.
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateIntervalInfo(const Locale& locale, UErrorCode& status);
|
||||
|
||||
|
||||
/**
|
||||
* Copy constructor.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateIntervalInfo(const DateIntervalInfo&);
|
||||
|
||||
/**
|
||||
* Assignment operator
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
DateIntervalInfo& operator=(const DateIntervalInfo&);
|
||||
|
||||
/**
|
||||
* Clone this object polymorphically.
|
||||
* The caller owns the result and should delete it when done.
|
||||
* @return a copy of the object
|
||||
* @draft ICU4.0
|
||||
*/
|
||||
DateIntervalInfo* clone(void) const;
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
* It is virtual to be safe, but it is not designed to be subclassed.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
virtual ~DateIntervalInfo();
|
||||
|
||||
|
||||
/**
|
||||
* Return true if another object is semantically equal to this one.
|
||||
*
|
||||
* @param other the DateIntervalInfo object to be compared with.
|
||||
* @return true if other is semantically equal to this.
|
||||
* @stable ICU 4.0
|
||||
*/
|
||||
UBool operator==(const DateIntervalInfo& other) const;
|
||||
|
||||
/**
|
||||
* Return true if another object is semantically unequal to this one.
|
||||
*
|
||||
* @param other the DateIntervalInfo object to be compared with.
|
||||
* @return true if other is semantically unequal to this.
|
||||
* @stable ICU 4.0
|
||||
*/
|
||||
UBool operator!=(const DateIntervalInfo& other) const;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Provides a way for client to build interval patterns.
|
||||
* User could construct DateIntervalInfo by providing
|
||||
* a list of patterns.
|
||||
* <P>
|
||||
* For example:
|
||||
* <pre>
|
||||
* UErrorCode status = U_ZERO_ERROR;
|
||||
* DateIntervalInfo dIntervalInfo = new DateIntervalInfo();
|
||||
* dIntervalInfo->setIntervalPattern("yMd", UCAL_YEAR, "'from' yyyy-M-d 'to' yyyy-M-d", status);
|
||||
* dIntervalInfo->setIntervalPattern("yMMMd", UCAL_MONTH, "'from' yyyy MMM d 'to' MMM d", status);
|
||||
* dIntervalInfo->setIntervalPattern("yMMMd", UCAL_DAY, "yyyy MMM d-d", status, status);
|
||||
* dIntervalInfo->setFallbackIntervalPattern("{0} ~ {1}");
|
||||
* </pre>
|
||||
*
|
||||
* Restriction:
|
||||
* Currently, users can only set interval patterns when the following
|
||||
* calendar fields are different: ERA, YEAR, MONTH, DATE, DAY_OF_MONTH,
|
||||
* DAY_OF_WEEK, AM_PM, HOUR, HOUR_OF_DAY, and MINUTE.
|
||||
* Interval patterns when other calendar fields are different are
|
||||
* not supported.
|
||||
*
|
||||
* @param skeleton the skeleton on which interval pattern based
|
||||
* @param lrgDiffCalUnit the largest different calendar unit.
|
||||
* @param intervalPattern the interval pattern on the largest different
|
||||
* calendar unit.
|
||||
* For example, if lrgDiffCalUnit is
|
||||
* "year", the interval pattern for en_US when year
|
||||
* is different could be "'from' yyyy 'to' yyyy".
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
void setIntervalPattern(const UnicodeString& skeleton,
|
||||
UCalendarDateFields lrgDiffCalUnit,
|
||||
const UnicodeString& intervalPattern,
|
||||
UErrorCode& status);
|
||||
|
||||
/**
|
||||
* Get the interval pattern given the largest different calendar field.
|
||||
* @param skeleton the skeleton
|
||||
* @param field the largest different calendar field
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @return interval pattern
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
const UnicodeString* getIntervalPattern(const UnicodeString& skeleton,
|
||||
UCalendarDateFields field,
|
||||
UErrorCode& status) const;
|
||||
|
||||
/**
|
||||
* Get the fallback interval pattern.
|
||||
* @return fallback interval pattern
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
const UnicodeString& getFallbackIntervalPattern() const;
|
||||
|
||||
|
||||
/**
|
||||
* Set the fallback interval pattern.
|
||||
* Fall-back interval pattern is get from locale resource.
|
||||
* If a user want to set their own fall-back interval pattern,
|
||||
* they can do so by calling the following method.
|
||||
* For users who construct DateIntervalInfo() by default constructor,
|
||||
* all interval patterns ( including fall-back ) are not set,
|
||||
* those users need to call setIntervalPattern() to set their own
|
||||
* interval patterns, and call setFallbackIntervalPattern() to set
|
||||
* their own fall-back interval patterns. If a certain interval pattern
|
||||
* ( for example, the interval pattern when 'year' is different ) is not
|
||||
* found, fall-back pattern will be used.
|
||||
* For those users who set all their patterns ( instead of calling
|
||||
* non-defaul constructor to let constructor get those patterns from
|
||||
* locale ), if they do not set the fall-back interval pattern,
|
||||
* it will be fall-back to '{date0} - {date1}'.
|
||||
*
|
||||
* @param fallbackPattern fall-back interval pattern.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
void setFallbackIntervalPattern(const UnicodeString& fallbackPattern);
|
||||
|
||||
|
||||
/* Get default order
|
||||
* return default date ordering in interval pattern
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
UBool getDefaultOrder() const;
|
||||
|
||||
|
||||
/**
|
||||
* ICU "poor man's RTTI", returns a UClassID for the actual class.
|
||||
*
|
||||
* @stable ICU 4.0
|
||||
*/
|
||||
virtual UClassID getDynamicClassID() const;
|
||||
|
||||
/**
|
||||
* ICU "poor man's RTTI", returns a UClassID for this class.
|
||||
*
|
||||
* @stable ICU 4.0
|
||||
*/
|
||||
static UClassID U_EXPORT2 getStaticClassID();
|
||||
|
||||
|
||||
private:
|
||||
/**
|
||||
* DateIntervalFormat will need access to
|
||||
* getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex,
|
||||
* and calendarFieldToPatternIndex().
|
||||
*
|
||||
* Instead of making above public,
|
||||
* make DateIntervalFormat a friend of DateIntervalInfo.
|
||||
*/
|
||||
friend class DateIntervalFormat;
|
||||
|
||||
/**
|
||||
* Following is for saving the interval patterns.
|
||||
* We only support interval patterns on
|
||||
* ERA, YEAR, MONTH, DAY, AM_PM, HOUR, and MINUTE
|
||||
*/
|
||||
enum IntervalPatternIndex
|
||||
{
|
||||
kIPI_ERA,
|
||||
kIPI_YEAR,
|
||||
kIPI_MONTH,
|
||||
kIPI_DATE,
|
||||
kIPI_AM_PM,
|
||||
kIPI_HOUR,
|
||||
kIPI_MINUTE,
|
||||
kIPI_MAX_INDEX
|
||||
};
|
||||
|
||||
/**
|
||||
* Initialize the DateIntervalInfo from locale
|
||||
* @param locale the given locale.
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
void initializeData(const Locale& locale, UErrorCode& status);
|
||||
|
||||
|
||||
/* Set Interval pattern.
|
||||
*
|
||||
* It sets interval pattern into the hash map.
|
||||
*
|
||||
* @param skeleton skeleton on which the interval pattern based
|
||||
* @param lrgDiffCalUnit the largest different calendar unit.
|
||||
* @param intervalPattern the interval pattern on the largest different
|
||||
* calendar unit.
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
void setIntervalPatternInternally(const UnicodeString& skeleton,
|
||||
UCalendarDateFields lrgDiffCalUnit,
|
||||
const UnicodeString& intervalPattern,
|
||||
UErrorCode& status);
|
||||
|
||||
|
||||
/**given an input skeleton, get the best match skeleton
|
||||
* which has pre-defined interval pattern in resource file.
|
||||
* Also return the difference between the input skeleton
|
||||
* and the best match skeleton.
|
||||
*
|
||||
* TODO (xji): set field weight or
|
||||
* isolate the funtionality in DateTimePatternGenerator
|
||||
* @param skeleton input skeleton
|
||||
* @param bestMatchDistanceInfo the difference between input skeleton
|
||||
* and best match skeleton.
|
||||
* 0, if there is exact match for input skeleton
|
||||
* 1, if there is only field width difference between
|
||||
* the best match and the input skeleton
|
||||
* 2, the only field difference is 'v' and 'z'
|
||||
* -1, if there is calendar field difference between
|
||||
* the best match and the input skeleton
|
||||
* @return best match skeleton
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
const UnicodeString* getBestSkeleton(const UnicodeString& skeleton,
|
||||
int8_t& bestMatchDistanceInfo) const;
|
||||
|
||||
|
||||
/**
|
||||
* Parse skeleton, save each field's width.
|
||||
* It is used for looking for best match skeleton,
|
||||
* and adjust pattern field width.
|
||||
* @param skeleton skeleton to be parsed
|
||||
* @param skeletonFieldWidth parsed skeleton field width
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
static void U_EXPORT2 parseSkeleton(const UnicodeString& skeleton,
|
||||
int32_t* skeletonFieldWidth);
|
||||
|
||||
|
||||
/**
|
||||
* Check whether one field width is numeric while the other is string.
|
||||
*
|
||||
* TODO (xji): make it general
|
||||
*
|
||||
* @param fieldWidth one field width
|
||||
* @param anotherFieldWidth another field width
|
||||
* @param patternLetter pattern letter char
|
||||
* @return true if one field width is numeric and the other is string,
|
||||
* false otherwise.
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
static UBool U_EXPORT2 stringNumeric(int32_t fieldWidth,
|
||||
int32_t anotherFieldWidth,
|
||||
char patternLetter);
|
||||
|
||||
|
||||
/**
|
||||
* Convert calendar field to the interval pattern index in
|
||||
* hash table.
|
||||
*
|
||||
* Since we only support the following calendar fields:
|
||||
* ERA, YEAR, MONTH, DATE, DAY_OF_MONTH, DAY_OF_WEEK,
|
||||
* AM_PM, HOUR, HOUR_OF_DAY, and MINUTE,
|
||||
* We reserve only 4 interval patterns for a skeleton.
|
||||
*
|
||||
* @param field calendar field
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @return interval pattern index in hash table
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
static IntervalPatternIndex U_EXPORT2 calendarFieldToIntervalIndex(
|
||||
UCalendarDateFields field,
|
||||
UErrorCode& status);
|
||||
|
||||
|
||||
/**
|
||||
* delete hash table (of type fIntervalPatterns).
|
||||
*
|
||||
* @param hTable hash table to be deleted
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
void deleteHash(Hashtable* hTable);
|
||||
|
||||
|
||||
/**
|
||||
* initialize hash table (of type fIntervalPatterns).
|
||||
*
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @return hash table initialized
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
Hashtable* initHash(UErrorCode& status);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* copy hash table (of type fIntervalPatterns).
|
||||
*
|
||||
* @param source the source to copy from
|
||||
* @param target the target to copy to
|
||||
* @param status output param set to success/failure code on exit
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
void copyHash(const Hashtable* source, Hashtable* target, UErrorCode& status);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* set hash table value comparator
|
||||
*
|
||||
* @param val1 one value in comparison
|
||||
* @param val2 the other value in comparison
|
||||
* @return TRUE if 2 values are the same, FALSE otherwise
|
||||
*/
|
||||
static UBool U_EXPORT2 hashTableValueComparator(UHashTok val1, UHashTok val2);
|
||||
|
||||
|
||||
// data members
|
||||
// fallback interval pattern
|
||||
UnicodeString fFallbackIntervalPattern;
|
||||
// default order
|
||||
UBool fFirstDateInPtnIsLaterDate;
|
||||
|
||||
// HashMap<UnicodeString, UnicodeString[kIPI_MAX_INDEX]>
|
||||
// HashMap( skeleton, pattern[largest_different_field] )
|
||||
Hashtable* fIntervalPatterns;
|
||||
|
||||
};// end class DateIntervalInfo
|
||||
|
||||
|
||||
inline UBool
|
||||
DateIntervalInfo::operator!=(const DateIntervalInfo& other) const {
|
||||
return !operator==(other);
|
||||
}
|
||||
|
||||
|
||||
inline UBool
|
||||
DateIntervalInfo::getDefaultOrder() const {
|
||||
return fFirstDateInPtnIsLaterDate;
|
||||
}
|
||||
|
||||
|
||||
inline const UnicodeString&
|
||||
DateIntervalInfo::getFallbackIntervalPattern() const {
|
||||
return fFallbackIntervalPattern;
|
||||
}
|
||||
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -606,6 +606,43 @@ public:
|
|||
*/
|
||||
virtual void adoptCalendar(Calendar* calendarToAdopt);
|
||||
|
||||
/**
|
||||
* Check whether the 'field' is smaller than all the fields covered in
|
||||
* pattern, return TRUE if it is. The sequence of calendar field,
|
||||
* from large to small is: ERA, YEAR, MONTH, DATE, AM_PM, HOUR, MINUTE,...
|
||||
* @param field the calendar field need to check against
|
||||
* @return TRUE if the 'field' is smaller than all the fields
|
||||
* covered in pattern. FALSE otherwise.
|
||||
* @internal ICU 4.0
|
||||
*/
|
||||
UBool isFieldUnitIgnored(UCalendarDateFields field) const;
|
||||
|
||||
|
||||
/**
|
||||
* Check whether the 'field' is smaller than all the fields covered in
|
||||
* pattern, return TRUE if it is. The sequence of calendar field,
|
||||
* from large to small is: ERA, YEAR, MONTH, DATE, AM_PM, HOUR, MINUTE,...
|
||||
* @param pattern the pattern to check against
|
||||
* @param field the calendar field need to check against
|
||||
* @return TRUE if the 'field' is smaller than all the fields
|
||||
* covered in pattern. FALSE otherwise.
|
||||
* @internal ICU 4.0
|
||||
*/
|
||||
static UBool isFieldUnitIgnored(const UnicodeString& pattern,
|
||||
UCalendarDateFields field);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Get the locale of this simple date formatter.
|
||||
* It is used in DateIntervalFormat.
|
||||
*
|
||||
* @return locale in this simple date formatter
|
||||
* @internal ICU 4.0
|
||||
*/
|
||||
const Locale& getSmpFmtLocale(void) const;
|
||||
|
||||
|
||||
private:
|
||||
friend class DateFormat;
|
||||
|
||||
|
|
@ -826,6 +863,15 @@ private:
|
|||
*/
|
||||
static const UDateFormatField fgPatternIndexToDateFormatField[];
|
||||
|
||||
/**
|
||||
* Used to map Calendar field to field level.
|
||||
* The larger the level, the smaller the field unit.
|
||||
* For example, UCAL_ERA level is 0, UCAL_YEAR level is 10,
|
||||
* UCAL_MONTH level is 20.
|
||||
*/
|
||||
static const int32_t fgCalendarFieldToLevel[];
|
||||
static const int32_t fgPatternCharToLevel[];
|
||||
|
||||
/**
|
||||
* The formatting pattern for this formatter.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -171,6 +171,94 @@ typedef enum UDateFormatStyle {
|
|||
|
||||
} UDateFormatStyle;
|
||||
|
||||
|
||||
/**
|
||||
* Below are a set of pre-defined skeletons.
|
||||
* They have pre-defined interval patterns in resource files.
|
||||
* Users are encouraged to use them in date interval format factory methods.
|
||||
*
|
||||
* <P>
|
||||
* We choose to use predefined skeleton string instead of skeleton enum because
|
||||
* we need to keep consistency between DateFormat and DateIntervalFormat
|
||||
* factory methods.
|
||||
* It is not good to introduce another set of enum for skeleton while having
|
||||
* UDateFormatStyle for full pattern.
|
||||
* And it is not good to mix the set of enum for skeleton into UDateFormatStyle.
|
||||
* So, a new set of pre-defined skeleton is introduced below.
|
||||
* <P>
|
||||
*
|
||||
* A skeleton
|
||||
* <ul>
|
||||
* <li>
|
||||
* 1. only keeps the field pattern letter and ignores all other parts
|
||||
* in a pattern, such as space, punctuations, and string literals.
|
||||
* <li>
|
||||
* 2. hides the order of fields.
|
||||
* <li>
|
||||
* 3. might hide a field's pattern letter length.
|
||||
*
|
||||
* For those non-digit calendar fields, the pattern letter length is
|
||||
* important, such as MMM, MMMM, and MMMMM; EEE and EEEE,
|
||||
* and the field's pattern letter length is honored.
|
||||
*
|
||||
* For the digit calendar fields, such as M or MM, d or dd, yy or yyyy,
|
||||
* the field pattern length is ignored and the best match, which is defined
|
||||
* in date time patterns, will be returned without honor the field pattern
|
||||
* letter length in skeleton.
|
||||
* </ul>
|
||||
*
|
||||
* <P>
|
||||
* For example, given skeleton YEAR_MONTH_DAY_SHORT_FORMAT, which is "yMd",
|
||||
* for English, the full pattern is "M/d/yy", which is the short format
|
||||
* of date pattern having DAY, MONTH, and YEAR.
|
||||
*
|
||||
* <P>
|
||||
* The skeletons defined below consists of the desired calendar field set
|
||||
* (for example, DAY, MONTH, YEAR) and the format length (long, medium, short)
|
||||
* used in date time patterns.
|
||||
*
|
||||
* For example, skeleton YEAR_MONTH_MEDIUM_FORMAT consists month and year,
|
||||
* and it's corresponding full pattern is medium format date pattern.
|
||||
* So, the skeleton is "yMMM", for English, the full pattern is "MMM yyyy",
|
||||
* which is the format by removing DATE from medium date format.
|
||||
*
|
||||
* For example, skeleton YEAR_MONTH_DOW_DAY_MEDIUM_FORMAT consists day, month,
|
||||
* year, and day-of-week, and it's corresponding full pattern is the medium
|
||||
* format date pattern. So, the skeleton is "yMMMEEEd", for English,
|
||||
* the full pattern is "EEE, MMM d, yyyy", which is the medium date format
|
||||
* plus day-of-week.
|
||||
*
|
||||
* @draft ICU 4.0
|
||||
*/
|
||||
|
||||
#define YEAR_MONTH_DOW_DAY_LONG_FORMAT "yMMMMEEEEd"
|
||||
#define YEAR_MONTH_DAY_LONG_FORMAT "yMMMMd"
|
||||
#define MONTH_DAY_LONG_FORMAT "MMMMd"
|
||||
#define YEAR_MONTH_LONG_FORMAT "yMMMM"
|
||||
#define MONTH_DOW_DAY_LONG_FORMAT "MMMMEEEEd"
|
||||
#define YEAR_MONTH_DOW_DAY_MEDIUM_FORMAT "yMMMEEEd"
|
||||
#define YEAR_MONTH_DAY_MEDIUM_FORMAT "yMMMd"
|
||||
#define MONTH_DAY_MEDIUM_FORMAT "MMMd"
|
||||
#define YEAR_MONTH_MEDIUM_FORMAT "yMMM"
|
||||
#define MONTH_DOW_DAY_MEDIUM_FORMAT "MMMEEEd"
|
||||
#define YEAR_MONTH_DOW_DAY_SHORT_FORMAT "yMEEEd"
|
||||
#define YEAR_MONTH_DAY_SHORT_FORMAT "yMd"
|
||||
#define MONTH_DAY_SHORT_FORMAT "Md"
|
||||
#define YEAR_MONTH_SHORT_FORMAT "yM"
|
||||
#define MONTH_DOW_DAY_SHORT_FORMAT "MEEEd"
|
||||
#define DAY_ONLY_SHORT_FORMAT "d"
|
||||
#define DOW_DAY_SHORT_FORMAT "EEEd"
|
||||
#define YEAR_ONLY_SHORT_FORMAT "y"
|
||||
#define MONTH_ONLY_SHORT_FORMAT "M"
|
||||
#define MONTH_ONLY_MEDIUM_FORMAT "MMM"
|
||||
#define MONTH_ONLY_LONG_FORMAT "MMMM"
|
||||
#define HOUR_MINUTE_FORMAT "hm"
|
||||
#define HOUR_MINUTE_GENERAL_TZ_FORMAT "hmv"
|
||||
#define HOUR_MINUTE_DAYLIGNT_TZ_FORMAT "hmz"
|
||||
#define HOUR_ONLY_FORMAT "h"
|
||||
#define HOUR_GENERAL_TZ_FORMAT "hv"
|
||||
#define HOUR_DAYLIGNT_TZ_FORMAT "hz"
|
||||
|
||||
/**
|
||||
* FieldPosition and UFieldPosition selectors for format fields
|
||||
* defined by DateFormat and UDateFormat.
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ jamotest.o srchtest.o reptest.o regextst.o \
|
|||
itrbnf.o itrbnfrt.o itrbnfp.o ucaconf.o icusvtst.o \
|
||||
uobjtest.o idnaref.o idnaconf.o nptrans.o punyref.o testidn.o testidna.o incaltst.o \
|
||||
calcasts.o v32test.o uvectest.o textfile.o tokiter.o utxttest.o \
|
||||
windttst.o winnmtst.o winutil.o csdetest.o tzrulets.o tzoffloc.o tzfmttst.o ssearch.o
|
||||
windttst.o winnmtst.o winutil.o csdetest.o tzrulets.o tzoffloc.o tzfmttst.o ssearch.o dtifmtts.o
|
||||
|
||||
DEPS = $(OBJECTS:.o=.d)
|
||||
|
||||
|
|
|
|||
563
icu4c/source/test/intltest/dtifmtts.cpp
Normal file
563
icu4c/source/test/intltest/dtifmtts.cpp
Normal file
|
|
@ -0,0 +1,563 @@
|
|||
|
||||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2008, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
|
||||
#if !UCONFIG_NO_FORMATTING
|
||||
|
||||
|
||||
//FIXME: how to define it in compiler time
|
||||
#define DTIFMTTS_DEBUG 1
|
||||
|
||||
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
#include <iostream>
|
||||
#endif
|
||||
|
||||
#include "cstring.h"
|
||||
#include "dtifmtts.h"
|
||||
#include "unicode/dtintrv.h"
|
||||
#include "unicode/dtitvinf.h"
|
||||
#include "unicode/dtitvfmt.h"
|
||||
|
||||
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
//#define PRINTMESG(msg) { std::cout << "(" << __FILE__ << ":" << __LINE__ << ") " << msg << "\n"; }
|
||||
#define PRINTMESG(msg) { std::cout << msg; }
|
||||
#endif
|
||||
|
||||
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
|
||||
|
||||
|
||||
// This is an API test, not a unit test. It doesn't test very many cases, and doesn't
|
||||
// try to test the full functionality. It just calls each function in the class and
|
||||
// verifies that it works on a basic level.
|
||||
|
||||
void DateIntervalFormatTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ ) {
|
||||
if (exec) logln("TestSuite DateIntervalFormat");
|
||||
switch (index) {
|
||||
// TODO: uncomment. comment out temporarily
|
||||
//TESTCASE(0, testAPI);
|
||||
//TESTCASE(1, testFormat);
|
||||
default: name = ""; break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test various generic API methods of DateIntervalFormat for API coverage.
|
||||
*/
|
||||
void DateIntervalFormatTest::testAPI() {
|
||||
|
||||
// ======= Test create instance with default local
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create instance with defaule locale");
|
||||
|
||||
DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (default) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
// ======= Test create instance with given locale
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create instance with given locale");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createInstance(Locale::getGerman(), status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (given locale) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
/* ====== Test create date interval instance with default locale and
|
||||
* ====== date format style
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create date instance with default locale and date format style");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createDateIntervalInstance(DateFormat::kFull, status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (default local + date style) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
/* ====== Test create date interval instance with given locale and
|
||||
* ====== date format style
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create date instance with given locale and date format style");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createDateIntervalInstance(DateFormat::kFull, Locale::getFrench(), status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (local + date style) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
|
||||
/* ====== Test create time interval instance with default locale and
|
||||
* ====== time format style
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create time instance with default locale and time format style");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createTimeIntervalInstance(DateFormat::kLong, status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (default local + time style) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
/* ====== Test create time interval instance with given locale and
|
||||
* ====== time format style
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create time instance with given locale and time format style");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createTimeIntervalInstance(DateFormat::kLong, Locale::getItalian(), status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (local + time style) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
/* ====== Test create date time interval instance with default locale and
|
||||
* ====== date time format style
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create date time instance with iven locale and date time format style");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createDateTimeIntervalInstance(DateFormat::kMedium, DateFormat::kShort, status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (default locale + date time style) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
|
||||
/* ====== Test create date time interval instance with given locale and
|
||||
* ====== date time format style
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create date time instance with given locale and date time format style");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createDateTimeIntervalInstance(DateFormat::kMedium, DateFormat::kShort, Locale::getItalian(), status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (local + date time style) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
|
||||
/* ====== Test create interval instance with default locale and skeleton
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create instance with default locale and skeleton");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createInstance(YEAR_MONTH_DAY_LONG_FORMAT, FALSE, status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + default locale) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
|
||||
/* ====== Test create interval instance with given locale and skeleton
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create instance with given locale and skeleton");
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createInstance(YEAR_MONTH_DAY_LONG_FORMAT, FALSE, Locale::getJapanese(), status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + locale) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
|
||||
/* ====== Test create interval instance with dateIntervalInfo and skeleton
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create instance with dateIntervalInfo and skeleton");
|
||||
|
||||
DateIntervalInfo* dtitvinf = new DateIntervalInfo(Locale::getSimplifiedChinese(), status);
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createInstance("EEEdMMMyhms", FALSE, dtitvinf, status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + DateIntervalInfo + default locale) - exitting");
|
||||
return;
|
||||
} else {
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
|
||||
/* ====== Test create interval instance with dateIntervalInfo and skeleton
|
||||
*/
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat create instance with dateIntervalInfo and skeleton");
|
||||
|
||||
dtitvinf = new DateIntervalInfo(Locale::getSimplifiedChinese(), status);
|
||||
|
||||
dtitvfmt = DateIntervalFormat::createInstance("EEEdMMMyhms", FALSE, Locale::getSimplifiedChinese(), dtitvinf, status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (skeleton + DateIntervalInfo + locale) - exitting");
|
||||
return;
|
||||
}
|
||||
// not deleted, test clone
|
||||
|
||||
|
||||
// ====== Test clone()
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat clone");
|
||||
|
||||
DateIntervalFormat* another = (DateIntervalFormat*)dtitvfmt->clone();
|
||||
if ( (*another) != (*dtitvfmt) ) {
|
||||
dataerrln("ERROR: clone failed");
|
||||
}
|
||||
|
||||
|
||||
// ====== Test getDateIntervalInfo, setDateIntervalInfo, adoptDateIntervalInfo
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat getDateIntervalInfo");
|
||||
const DateIntervalInfo* inf = another->getDateIntervalInfo();
|
||||
dtitvfmt->setDateIntervalInfo(*inf, status);
|
||||
const DateIntervalInfo* anotherInf = dtitvfmt->getDateIntervalInfo();
|
||||
if ( (*inf) != (*anotherInf) || U_FAILURE(status) ) {
|
||||
dataerrln("ERROR: getDateIntervalInfo/setDateIntervalInfo failed");
|
||||
}
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
DateIntervalInfo* nonConstInf = inf->clone();
|
||||
dtitvfmt->adoptDateIntervalInfo(nonConstInf, status);
|
||||
anotherInf = dtitvfmt->getDateIntervalInfo();
|
||||
if ( (*inf) != (*anotherInf) || U_FAILURE(status) ) {
|
||||
dataerrln("ERROR: adoptDateIntervalInfo failed");
|
||||
}
|
||||
|
||||
// ====== Test getDateFormat, setDateFormat, adoptDateFormat
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
logln("Testing DateIntervalFormat getDateFormat");
|
||||
const DateFormat* fmt = another->getDateFormat();
|
||||
dtitvfmt->setDateFormat(*fmt, status);
|
||||
const DateFormat* anotherFmt = dtitvfmt->getDateFormat();
|
||||
if ( (*fmt) != (*anotherFmt) || U_FAILURE(status) ) {
|
||||
dataerrln("ERROR: getDateFormat/setDateFormat failed");
|
||||
}
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
DateFormat* nonConstFmt = (DateFormat*)fmt->clone();
|
||||
dtitvfmt->adoptDateFormat(nonConstFmt, status);
|
||||
anotherFmt = dtitvfmt->getDateFormat();
|
||||
if ( (*fmt) != (*anotherFmt) || U_FAILURE(status) ) {
|
||||
dataerrln("ERROR: adoptDateFormat failed");
|
||||
}
|
||||
|
||||
|
||||
// ======= Test getStaticClassID()
|
||||
|
||||
logln("Testing getStaticClassID()");
|
||||
|
||||
|
||||
if(dtitvfmt->getDynamicClassID() != DateIntervalFormat::getStaticClassID()) {
|
||||
errln("ERROR: getDynamicClassID() didn't return the expected value");
|
||||
}
|
||||
|
||||
delete another;
|
||||
|
||||
// ====== test constructor/copy constructor and assignment
|
||||
/* they are protected, no test
|
||||
logln("Testing DateIntervalFormat constructor and assigment operator");
|
||||
status = U_ZERO_ERROR;
|
||||
|
||||
DateFormat* constFmt = (constFmt*)dtitvfmt->getDateFormat()->clone();
|
||||
inf = dtitvfmt->getDateIntervalInfo()->clone();
|
||||
|
||||
|
||||
DateIntervalFormat* dtifmt = new DateIntervalFormat(fmt, inf, status);
|
||||
if(U_FAILURE(status)) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (default) - exitting");
|
||||
return;
|
||||
}
|
||||
|
||||
DateIntervalFormat* dtifmt2 = new(dtifmt);
|
||||
if ( (*dtifmt) != (*dtifmt2) ) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (default) - exitting");
|
||||
return;
|
||||
}
|
||||
|
||||
DateIntervalFormat dtifmt3 = (*dtifmt);
|
||||
if ( (*dtifmt) != dtifmt3 ) {
|
||||
dataerrln("ERROR: Could not create DateIntervalFormat (default) - exitting");
|
||||
return;
|
||||
}
|
||||
|
||||
delete dtifmt2;
|
||||
delete dtifmt3;
|
||||
delete dtifmt;
|
||||
*/
|
||||
|
||||
delete dtitvfmt;
|
||||
|
||||
|
||||
//====== test format in testFormat()
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test various generic API methods of DateIntervalFormat for API coverage.
|
||||
*/
|
||||
void DateIntervalFormatTest::testFormat() {
|
||||
|
||||
const char* DATA[] = {
|
||||
"yyyy MM dd HH:mm:ss",
|
||||
"2007 10 10 10:10:10", "2008 10 10 10:10:10",
|
||||
"2007 10 10 10:10:10", "2007 11 10 10:10:10",
|
||||
"2007 11 10 10:10:10", "2007 11 20 10:10:10",
|
||||
"2007 01 10 10:00:10", "2007 01 10 14:10:10",
|
||||
"2007 01 10 10:00:10", "2007 01 10 10:20:10",
|
||||
"2007 01 10 10:10:10", "2007 01 10 10:10:20",
|
||||
};
|
||||
|
||||
const char* testLocale[][3] = {
|
||||
{"en", "", ""},
|
||||
{"zh", "", ""},
|
||||
{"de", "", ""},
|
||||
{"ar", "", ""},
|
||||
{"en", "GB", ""},
|
||||
{"fr", "", ""},
|
||||
{"it", "", ""},
|
||||
{"nl", "", ""},
|
||||
{"zh", "TW", ""},
|
||||
{"ja", "", ""},
|
||||
{"pt", "BR", ""},
|
||||
{"ru", "", ""},
|
||||
{"pl", "", ""},
|
||||
{"tr", "", ""},
|
||||
{"es", "", ""},
|
||||
{"ko", "", ""},
|
||||
{"th", "", ""},
|
||||
{"sv", "", ""},
|
||||
{"fi", "", ""},
|
||||
{"da", "", ""},
|
||||
{"pt", "PT", ""},
|
||||
{"ro", "", ""},
|
||||
{"hu", "", ""},
|
||||
{"he", "", ""},
|
||||
{"in", "", ""},
|
||||
{"cs", "", ""},
|
||||
{"el", "", ""},
|
||||
{"no", "", ""},
|
||||
{"vi", "", ""},
|
||||
{"bg", "", ""},
|
||||
{"hr", "", ""},
|
||||
{"lt", "", ""},
|
||||
{"sk", "", ""},
|
||||
{"sl", "", ""},
|
||||
{"sr", "", ""},
|
||||
{"ca", "", ""},
|
||||
{"lv", "", ""},
|
||||
{"uk", "", ""},
|
||||
{"hi", "", ""},
|
||||
};
|
||||
|
||||
|
||||
uint32_t localeIndex;
|
||||
for ( localeIndex = 0; localeIndex < ARRAY_SIZE(testLocale); ++localeIndex ) {
|
||||
char locName[32];
|
||||
uprv_strcpy(locName, testLocale[localeIndex][0]);
|
||||
uprv_strcat(locName, testLocale[localeIndex][1]);
|
||||
expect(DATA, ARRAY_SIZE(DATA), Locale(testLocale[localeIndex][0], testLocale[localeIndex][1], testLocale[localeIndex][2]), locName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void DateIntervalFormatTest::expect(const char** data, int32_t data_length,
|
||||
const Locale& loc, const char* locName) {
|
||||
|
||||
/*
|
||||
UnicodeString formatResults[] = {
|
||||
};
|
||||
*/
|
||||
|
||||
UnicodeString skeleton[] = {
|
||||
"EEEEdMMMMy",
|
||||
"dMMMMy",
|
||||
"dMMMM",
|
||||
"MMMMy",
|
||||
"EEEEdMMMM",
|
||||
"EEEdMMMy",
|
||||
"dMMMy",
|
||||
"dMMM",
|
||||
"MMMy",
|
||||
"EEEdMMM",
|
||||
"EEEdMy",
|
||||
"dMy",
|
||||
"dM",
|
||||
"My",
|
||||
"EEEdM",
|
||||
"d",
|
||||
"EEEd",
|
||||
"y",
|
||||
"M",
|
||||
"MMM",
|
||||
"MMMM",
|
||||
"hm",
|
||||
"hmv",
|
||||
"hmz",
|
||||
"h",
|
||||
"hv",
|
||||
"hz",
|
||||
"EEddMMyyyy", // following could be normalized
|
||||
"EddMMy",
|
||||
"hhmm",
|
||||
"hhmmzz",
|
||||
"hms", // following could not be normalized
|
||||
"dMMMMMy",
|
||||
"EEEEEdM",
|
||||
};
|
||||
|
||||
int32_t i = 0;
|
||||
UErrorCode ec = U_ZERO_ERROR;
|
||||
UnicodeString str, str2;
|
||||
SimpleDateFormat ref(data[i++], loc, ec);
|
||||
if (!assertSuccess("construct SimpleDateFormat", ec)) return;
|
||||
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
char result[1000];
|
||||
char mesg[1000];
|
||||
sprintf(mesg, "locale: %s\n", locName);
|
||||
PRINTMESG(mesg);
|
||||
#endif
|
||||
|
||||
while (i<data_length) {
|
||||
|
||||
// 'f'
|
||||
const char* datestr = data[i++];
|
||||
const char* datestr_2 = data[i++];
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
sprintf(mesg, "original date: %s - %s\n", datestr, datestr_2);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
UDate date = ref.parse(ctou(datestr), ec);
|
||||
if (!assertSuccess("parse", ec)) return;
|
||||
UDate date_2 = ref.parse(ctou(datestr_2), ec);
|
||||
if (!assertSuccess("parse", ec)) return;
|
||||
DateInterval dtitv(date, date_2);
|
||||
|
||||
for ( DateFormat::EStyle style = DateFormat::kFull;
|
||||
style < DateFormat::kDateOffset;
|
||||
style = (DateFormat::EStyle)(style+1) ) {
|
||||
DateIntervalFormat* dtitvfmt = DateIntervalFormat::createDateIntervalInstance(style, loc, ec);
|
||||
FieldPosition pos=0;
|
||||
if (!assertSuccess("createDateInstance", ec)) return;
|
||||
dtitvfmt->format(&dtitv, str.remove(), pos, ec);
|
||||
if (!assertSuccess("format", ec)) return;
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
sprintf(mesg, "date interval, style = %d\n", style);
|
||||
PRINTMESG(mesg)
|
||||
str.extract(0, str.length(), result, "UTF-8");
|
||||
sprintf(mesg, "interval date: %s\n", result);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
for ( DateFormat::EStyle style = DateFormat::kFull;
|
||||
style < DateFormat::kDateOffset;
|
||||
style = (DateFormat::EStyle)(style+1) ) {
|
||||
DateIntervalFormat* dtitvfmt = DateIntervalFormat::createTimeIntervalInstance(style, loc, ec);
|
||||
|
||||
if (!assertSuccess("createTimeInstance", ec)) return;
|
||||
FieldPosition pos=0;
|
||||
dtitvfmt->format(&dtitv, str.remove(), pos, ec);
|
||||
if (!assertSuccess("format", ec)) return;
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
sprintf(mesg, "time interval, style = %d\n", style);
|
||||
PRINTMESG(mesg)
|
||||
str.extract(0, str.length(), result, "UTF-8");
|
||||
sprintf(mesg, "interval date: %s\n", result);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
for ( DateFormat::EStyle style = DateFormat::kFull;
|
||||
style < DateFormat::kDateOffset;
|
||||
style = (DateFormat::EStyle)(style+1) ) {
|
||||
DateIntervalFormat* dtitvfmt = DateIntervalFormat::createDateTimeIntervalInstance(style, style, loc, ec);
|
||||
if (!assertSuccess("createDateTimeInstance", ec)) return;
|
||||
FieldPosition pos=0;
|
||||
dtitvfmt->format(&dtitv, str.remove(), pos, ec);
|
||||
if (!assertSuccess("format", ec)) return;
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
sprintf(mesg, "date time interval, style = %d\n", style);
|
||||
PRINTMESG(mesg)
|
||||
str.extract(0, str.length(), result, "UTF-8");
|
||||
sprintf(mesg, "interval date: %s\n", result);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
for ( uint32_t skeletonIndex = 0;
|
||||
skeletonIndex < ARRAY_SIZE(skeleton);
|
||||
++skeletonIndex ) {
|
||||
const UnicodeString& oneSkeleton = skeleton[skeletonIndex];
|
||||
DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(oneSkeleton, FALSE, loc, ec);
|
||||
if (!assertSuccess("createInstance(skeleton)", ec)) return;
|
||||
FieldPosition pos=0;
|
||||
dtitvfmt->format(&dtitv, str.remove(), pos, ec);
|
||||
if (!assertSuccess("format", ec)) return;
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
oneSkeleton.extract(0, oneSkeleton.length(), result, "UTF-8");
|
||||
sprintf(mesg, "interval by skeleton: %s\n", result);
|
||||
PRINTMESG(mesg)
|
||||
str.extract(0, str.length(), result, "UTF-8");
|
||||
sprintf(mesg, "interval date: %s\n", result);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
delete dtitvfmt;
|
||||
}
|
||||
|
||||
// test user created DateIntervalInfo
|
||||
ec = U_ZERO_ERROR;
|
||||
DateIntervalInfo* dtitvinf = new DateIntervalInfo(ec);
|
||||
dtitvinf->setFallbackIntervalPattern("{0} --- {1}");
|
||||
dtitvinf->setIntervalPattern(YEAR_MONTH_DAY_MEDIUM_FORMAT, UCAL_MONTH, "yyyy MMM d - MMM y",ec);
|
||||
if (!assertSuccess("DateIntervalInfo::setIntervalPattern", ec)) return;
|
||||
dtitvinf->setIntervalPattern(YEAR_MONTH_DAY_MEDIUM_FORMAT, UCAL_HOUR_OF_DAY, "yyyy MMM d HH:mm - HH:mm", ec);
|
||||
if (!assertSuccess("DateIntervalInfo::setIntervalPattern", ec)) return;
|
||||
DateIntervalFormat* dtitvfmt = DateIntervalFormat::createInstance(YEAR_MONTH_DAY_MEDIUM_FORMAT, FALSE, loc, dtitvinf, ec);
|
||||
if (!assertSuccess("createInstance(skeleton,dtitvinf)", ec)) return;
|
||||
FieldPosition pos=0;
|
||||
dtitvfmt->format(&dtitv, str.remove(), pos, ec);
|
||||
if (!assertSuccess("format", ec)) return;
|
||||
#ifdef DTIFMTTS_DEBUG
|
||||
PRINTMESG("interval format using user defined DateIntervalInfo\n");
|
||||
str.extract(0, str.length(), result, "UTF-8");
|
||||
sprintf(mesg, "interval date: %s\n", result);
|
||||
PRINTMESG(mesg)
|
||||
#endif
|
||||
delete dtitvfmt;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* #if !UCONFIG_NO_FORMATTING */
|
||||
41
icu4c/source/test/intltest/dtifmtts.h
Normal file
41
icu4c/source/test/intltest/dtifmtts.h
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 2008, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
||||
#ifndef _INTLTESTDATEINTERVALFORMAT
|
||||
#define _INTLTESTDATEINTERVALFORMAT
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
#include "unicode/locid.h"
|
||||
|
||||
#if !UCONFIG_NO_FORMATTING
|
||||
|
||||
#include "intltest.h"
|
||||
|
||||
/**
|
||||
* Test basic functionality of various API functions
|
||||
**/
|
||||
class DateIntervalFormatTest: public IntlTest {
|
||||
void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = NULL );
|
||||
|
||||
public:
|
||||
/**
|
||||
* Performs tests on many API functions, see detailed comments in source code
|
||||
**/
|
||||
void testAPI();
|
||||
|
||||
/**
|
||||
* test formatting
|
||||
*/
|
||||
void testFormat();
|
||||
|
||||
private:
|
||||
void expect(const char** data, int32_t data_length, const Locale& loc,
|
||||
const char* locName);
|
||||
};
|
||||
|
||||
#endif /* #if !UCONFIG_NO_FORMATTING */
|
||||
|
||||
#endif
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2007, International Business Machines
|
||||
* Copyright (c) 1997-2008, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
||||
|
|
@ -50,6 +50,7 @@
|
|||
#include "tzfmttst.h" // TimeZoneFormatTest
|
||||
#include "plurults.h" // PluralRulesTest
|
||||
#include "plurfmts.h" // PluralFormatTest
|
||||
#include "dtifmtts.h" // DateIntervalFormatTest
|
||||
|
||||
#define TESTCLASS(id, TestClass) \
|
||||
case id: \
|
||||
|
|
@ -117,6 +118,7 @@ void IntlTestFormat::runIndexedTest( int32_t index, UBool exec, const char* &nam
|
|||
TESTCLASS(34,TimeZoneFormatTest);
|
||||
TESTCLASS(35,PluralRulesTest);
|
||||
TESTCLASS(36,PluralFormatTest);
|
||||
TESTCLASS(37,DateIntervalFormatTest);
|
||||
|
||||
default: name = ""; break; //needed to end loop
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue