ICU-64232.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / unicode / smpdtfmt.h

diff --git a/icuSources/i18n/unicode/smpdtfmt.h b/icuSources/i18n/unicode/smpdtfmt.h
index d03cf6617eca1b0ae6c805967f685d7d884393d8..6aa58eef6be8198caba8b4d79b6dbf0500a36017 100644 (file)
--- a/icuSources/i18n/unicode/smpdtfmt.h
+++ b/icuSources/i18n/unicode/smpdtfmt.h
@@ -50,6 +50,11 @@ class FieldPositionHandler;
 class TimeZoneFormat;
 class SharedNumberFormat;
 class SimpleDateFormatMutableNFs;
 class TimeZoneFormat;
 class SharedNumberFormat;
 class SimpleDateFormatMutableNFs;

+class DateIntervalFormat;
+
+namespace number {
+class LocalizedNumberFormatter;
+}

 
 /**
  *
 
 /**
  *


@@ -1144,7 +1149,7 @@ public:
      * Overrides base class method and
      * This method clears per field NumberFormat instances
      * previously set by {@see adoptNumberFormat(const UnicodeString&, NumberFormat*, UErrorCode)}
      * Overrides base class method and
      * This method clears per field NumberFormat instances
      * previously set by {@see adoptNumberFormat(const UnicodeString&, NumberFormat*, UErrorCode)}

-     * @param adoptNF the NumbeferFormat used
+     * @param formatToAdopt the NumbeferFormat used

      * @stable ICU 54
      */
     void adoptNumberFormat(NumberFormat *formatToAdopt);
      * @stable ICU 54
      */
     void adoptNumberFormat(NumberFormat *formatToAdopt);


@@ -1159,7 +1164,7 @@ public:
      * Per field NumberFormat can also be cleared in {@see DateFormat::setNumberFormat(const NumberFormat& newNumberFormat)}
      *
      * @param fields  the fields to override(like y)
      * Per field NumberFormat can also be cleared in {@see DateFormat::setNumberFormat(const NumberFormat& newNumberFormat)}
      *
      * @param fields  the fields to override(like y)

-     * @param adoptNF the NumbeferFormat used
+     * @param formatToAdopt the NumbeferFormat used

      * @param status  Receives a status code, which will be U_ZERO_ERROR
      *                if the operation succeeds.
      * @stable ICU 54
      * @param status  Receives a status code, which will be U_ZERO_ERROR
      *                if the operation succeeds.
      * @stable ICU 54


@@ -1226,6 +1231,7 @@ public:
 
 private:
     friend class DateFormat;
 
 private:
     friend class DateFormat;

+    friend class DateIntervalFormat;

 
     void initializeDefaultCentury(void);
 
 
     void initializeDefaultCentury(void);
 


@@ -1281,7 +1287,6 @@ private:
                    int32_t fieldNum,
                    FieldPositionHandler& handler,
                    Calendar& cal,
                    int32_t fieldNum,
                    FieldPositionHandler& handler,
                    Calendar& cal,

-                   SimpleDateFormatMutableNFs &mutableNFs,

                    UErrorCode& status) const; // in case of illegal argument
 
     /**
                    UErrorCode& status) const; // in case of illegal argument
 
     /**


@@ -1297,7 +1302,7 @@ private:
      * @param minDigits Minimum number of digits the result should have
      * @param maxDigits Maximum number of digits the result should have
      */
      * @param minDigits Minimum number of digits the result should have
      * @param maxDigits Maximum number of digits the result should have
      */

-    void zeroPaddingNumber(NumberFormat *currentNumberFormat,
+    void zeroPaddingNumber(const NumberFormat *currentNumberFormat,

                            UnicodeString &appendTo,
                            int32_t value,
                            int32_t minDigits,
                            UnicodeString &appendTo,
                            int32_t value,
                            int32_t minDigits,


@@ -1427,21 +1432,21 @@ private:
      */
     int32_t subParse(const UnicodeString& text, int32_t& start, char16_t ch, int32_t count,
                      UBool obeyCount, UBool allowNegative, UBool ambiguousYear[], int32_t& saveHebrewMonth, Calendar& cal,
      */
     int32_t subParse(const UnicodeString& text, int32_t& start, char16_t ch, int32_t count,
                      UBool obeyCount, UBool allowNegative, UBool ambiguousYear[], int32_t& saveHebrewMonth, Calendar& cal,

-                     int32_t patLoc, MessageFormat * numericLeapMonthFormatter, UTimeZoneFormatTimeType *tzTimeType, SimpleDateFormatMutableNFs &mutableNFs,
+                     int32_t patLoc, MessageFormat * numericLeapMonthFormatter, UTimeZoneFormatTimeType *tzTimeType,

                      int32_t *dayPeriod=NULL) const;
 
     void parseInt(const UnicodeString& text,
                   Formattable& number,
                   ParsePosition& pos,
                   UBool allowNegative,
                      int32_t *dayPeriod=NULL) const;
 
     void parseInt(const UnicodeString& text,
                   Formattable& number,
                   ParsePosition& pos,
                   UBool allowNegative,

-                  NumberFormat *fmt) const;
+                  const NumberFormat *fmt) const;

 
     void parseInt(const UnicodeString& text,
                   Formattable& number,
                   int32_t maxDigits,
                   ParsePosition& pos,
                   UBool allowNegative,
 
     void parseInt(const UnicodeString& text,
                   Formattable& number,
                   int32_t maxDigits,
                   ParsePosition& pos,
                   UBool allowNegative,

-                  NumberFormat *fmt) const;
+                  const NumberFormat *fmt) const;

 
     int32_t checkIntSuffix(const UnicodeString& text, int32_t start,
                            int32_t patLoc, UBool isNegative) const;
 
     int32_t checkIntSuffix(const UnicodeString& text, int32_t start,
                            int32_t patLoc, UBool isNegative) const;


@@ -1508,6 +1513,16 @@ private:
      */
     int32_t skipUWhiteSpace(const UnicodeString& text, int32_t pos) const;
 
      */
     int32_t skipUWhiteSpace(const UnicodeString& text, int32_t pos) const;
 

+    /**
+     * Initialize LocalizedNumberFormatter instances used for speedup.
+     */
+    void initFastNumberFormatters(UErrorCode& status);
+
+    /**
+     * Delete the LocalizedNumberFormatter instances used for speedup.
+     */
+    void freeFastNumberFormatters();
+

     /**
      * Initialize NumberFormat instances used for numbering system overrides.
      */
     /**
      * Initialize NumberFormat instances used for numbering system overrides.
      */


@@ -1531,7 +1546,7 @@ private:
     /**
      * Lazy TimeZoneFormat instantiation, semantically const
      */
     /**
      * Lazy TimeZoneFormat instantiation, semantically const
      */

-    TimeZoneFormat *tzFormat() const;
+    TimeZoneFormat *tzFormat(UErrorCode &status) const;

 
     const NumberFormat* getNumberFormatByIndex(UDateFormatField index) const;
 
 
     const NumberFormat* getNumberFormatByIndex(UDateFormatField index) const;
 


@@ -1625,6 +1640,20 @@ private:
      */
     const SharedNumberFormat    **fSharedNumberFormatters;
 
      */
     const SharedNumberFormat    **fSharedNumberFormatters;
 

+    enum NumberFormatterKey {
+        SMPDTFMT_NF_1x10,
+        SMPDTFMT_NF_2x10,
+        SMPDTFMT_NF_3x10,
+        SMPDTFMT_NF_4x10,
+        SMPDTFMT_NF_2x2,
+        SMPDTFMT_NF_COUNT
+    };
+
+    /**
+     * Number formatters pre-allocated for fast performance on the most common integer lengths.
+     */
+    const number::LocalizedNumberFormatter* fFastNumberFormatters[SMPDTFMT_NF_COUNT] = {};
+

     UBool fHaveDefaultCentury;
 
     BreakIterator* fCapitalizationBrkIter;
     UBool fHaveDefaultCentury;
 
     BreakIterator* fCapitalizationBrkIter;