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

ICU-1214 Replace getPatternChars with getPatternUChars

Browse Source 
X-SVN-Rev: 5789
This commit is contained in:
George Rhoten 2001-09-18 21:36:45 +00:00
parent a6196dd3d3
commit f776680929
4 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/i18n/dtfmtsym.cpp
View File

@ -433,6 +433,14 @@ DateFormatSymbols::getPatternChars(void)
//------------------------------------------------------ //------------------------------------------------------
const UChar *
DateFormatSymbols::getPatternUChars(void)
{
return gPatternChars;
}
//------------------------------------------------------
UnicodeString& UnicodeString&
DateFormatSymbols::getLocalPatternChars(UnicodeString& result) const DateFormatSymbols::getLocalPatternChars(UnicodeString& result) const
{ {

19
icu4c/source/i18n/smpdtfmt.cpp
View File

@ -34,6 +34,7 @@
#include "unicode/decimfmt.h" #include "unicode/decimfmt.h"
#include "unicode/dcfmtsym.h" #include "unicode/dcfmtsym.h"
#include "unicode/unicode.h" #include "unicode/unicode.h"
#include "unicode/ustring.h"
#include "mutex.h" #include "mutex.h"
#include <float.h> #include <float.h>
@ -504,18 +505,21 @@ SimpleDateFormat::subFormat(UnicodeString& result,
// this function gets called by format() to produce the appropriate substitution // this function gets called by format() to produce the appropriate substitution
// text for an individual pattern symbol (e.g., "HH" or "yyyy") // text for an individual pattern symbol (e.g., "HH" or "yyyy")
EField patternCharIndex = (EField) -1; UChar *patternCharPtr = u_strchr(DateFormatSymbols::getPatternUChars(), ch);
EField patternCharIndex;
int32_t maxIntCount = 10; int32_t maxIntCount = 10;
UnicodeString str; // Scratch UnicodeString str; // Scratch
result.remove(); result.remove();
// if the pattern character is unrecognized, signal an error and dump out // if the pattern character is unrecognized, signal an error and dump out
if ((patternCharIndex = (EField)DateFormatSymbols::getPatternChars().indexOf(ch)) == (EField)-1) if (patternCharPtr == NULL)
{ {
status = U_INVALID_FORMAT_ERROR; status = U_INVALID_FORMAT_ERROR;
return result; return result;
} }
patternCharIndex = (EField)(patternCharPtr - DateFormatSymbols::getPatternUChars());
Calendar::EDateFields field = fgPatternIndexToCalendarField[patternCharIndex]; Calendar::EDateFields field = fgPatternIndexToCalendarField[patternCharIndex];
int32_t value = fCalendar->get(field, status); int32_t value = fCalendar->get(field, status);
if (U_FAILURE(status)) return result; if (U_FAILURE(status)) return result;
@ -1067,11 +1071,14 @@ int32_t SimpleDateFormat::subParse(const UnicodeString& text, int32_t& start, UC
int32_t value = 0; int32_t value = 0;
int32_t i; int32_t i;
ParsePosition pos(0); ParsePosition pos(0);
int32_t patternCharIndex = -1; int32_t patternCharIndex;
UChar *patternCharPtr = u_strchr(DateFormatSymbols::getPatternUChars(), ch);
if ((patternCharIndex = DateFormatSymbols::getPatternChars().indexOf(ch)) == -1) if (patternCharPtr == NULL) {
return -start; return -start;
}
patternCharIndex = (EField)(patternCharPtr - DateFormatSymbols::getPatternUChars());
pos.setIndex(start); pos.setIndex(start);
Calendar::EDateFields field = fgPatternIndexToCalendarField[patternCharIndex]; Calendar::EDateFields field = fgPatternIndexToCalendarField[patternCharIndex];
@ -1461,7 +1468,7 @@ UnicodeString&
SimpleDateFormat::toLocalizedPattern(UnicodeString& result, SimpleDateFormat::toLocalizedPattern(UnicodeString& result,
UErrorCode& status) const UErrorCode& status) const
{ {
translatePattern(fPattern, result, DateFormatSymbols::getPatternChars(), fSymbols->fLocalPatternChars, status); translatePattern(fPattern, result, DateFormatSymbols::getPatternUChars(), fSymbols->fLocalPatternChars, status);
return result; return result;
} }
@ -1479,7 +1486,7 @@ void
SimpleDateFormat::applyLocalizedPattern(const UnicodeString& pattern, SimpleDateFormat::applyLocalizedPattern(const UnicodeString& pattern,
UErrorCode &status) UErrorCode &status)
{ {
translatePattern(pattern, fPattern, fSymbols->fLocalPatternChars, DateFormatSymbols::getPatternChars(), status); translatePattern(pattern, fPattern, fSymbols->fLocalPatternChars, DateFormatSymbols::getPatternUChars(), status);
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@ -222,10 +222,16 @@ public:
/** /**
* Get the non-localized date-time pattern characters. * Get the non-localized date-time pattern characters.
* @stable * @deprecated remove after Aug 2002. Use getPatternUChars instead.
*/ */
static const UnicodeString& getPatternChars(void); static const UnicodeString& getPatternChars(void);
/**
* Get the non-localized date-time pattern characters.
* @stable
*/
static const UChar *getPatternUChars(void);
/** /**
* Gets localized date-time pattern characters. For example: 'u', 't', etc. * Gets localized date-time pattern characters. For example: 'u', 't', etc.
* @return the localized date-time pattern characters. * @return the localized date-time pattern characters.

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

@ -130,8 +130,6 @@ void IntlTestDateFormatSymbols::testSymbols(/* char *par */)
} }
} }
const UnicodeString pattern = DateFormatSymbols::getPatternChars();
UnicodeString localPattern, pat1, pat2; UnicodeString localPattern, pat1, pat2;
localPattern = en.getLocalPatternChars(localPattern); localPattern = en.getLocalPatternChars(localPattern);
fr.setLocalPatternChars(localPattern); fr.setLocalPatternChars(localPattern);