ICU-64243.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / nfsubs.h

diff --git a/icuSources/i18n/nfsubs.h b/icuSources/i18n/nfsubs.h
index 644b4b2f6e1d6c32d1d415e9e5311ea601206b91..1dc15b04ca928ed7b0696a4d2cf2423f67ebee04 100644 (file)
--- a/icuSources/i18n/nfsubs.h
+++ b/icuSources/i18n/nfsubs.h
@@ -1,10 +1,12 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 ******************************************************************************
 /*
 ******************************************************************************

-*   Copyright (C) 1997-2007, International Business Machines
+*   Copyright (C) 1997-2015, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 ******************************************************************************
 *   file name:  nfsubs.h
 *   Corporation and others.  All Rights Reserved.
 ******************************************************************************
 *   file name:  nfsubs.h

-*   encoding:   US-ASCII
+*   encoding:   UTF-8

 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   tab size:   8 (not used)
 *   indentation:4
 *


@@ -32,12 +34,11 @@ U_NAMESPACE_BEGIN
 class NFSubstitution : public UObject {
     int32_t pos;
     const NFRuleSet* ruleSet;
 class NFSubstitution : public UObject {
     int32_t pos;
     const NFRuleSet* ruleSet;

-    const DecimalFormat* numberFormat;
+    DecimalFormat* numberFormat;

     
 protected:
     NFSubstitution(int32_t pos,
         const NFRuleSet* ruleSet,
     
 protected:
     NFSubstitution(int32_t pos,
         const NFRuleSet* ruleSet,

-        const RuleBasedNumberFormat* rbnf,

         const UnicodeString& description,
         UErrorCode& status);
     
         const UnicodeString& description,
         UErrorCode& status);
     


@@ -90,7 +91,7 @@ public:
      * @param radix The radix of the divisor
      * @param exponent The exponent of the divisor
      */
      * @param radix The radix of the divisor
      * @param exponent The exponent of the divisor
      */

-    virtual void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status);
+    virtual void setDivisor(int32_t radix, int16_t exponent, UErrorCode& status);

     
     /**
      * Replaces result with the string describing the substitution.
     
     /**
      * Replaces result with the string describing the substitution.


@@ -98,6 +99,8 @@ public:
      */
     virtual void toString(UnicodeString& result) const;
     
      */
     virtual void toString(UnicodeString& result) const;
     

+    void setDecimalFormatSymbols(const DecimalFormatSymbols &newSymbols, UErrorCode& status);
+

     //-----------------------------------------------------------------------
     // formatting
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
     // formatting
     //-----------------------------------------------------------------------


@@ -112,7 +115,7 @@ public:
      * rule text begins (this value is added to this substitution's
      * position to determine exactly where to insert the new text)
      */
      * rule text begins (this value is added to this substitution's
      * position to determine exactly where to insert the new text)
      */

-    virtual void doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t pos) const;
+    virtual void doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;

 
     /**
      * Performs a mathematical operation on the number, formats it using
 
     /**
      * Performs a mathematical operation on the number, formats it using


@@ -124,7 +127,7 @@ public:
      * rule text begins (this value is added to this substitution's
      * position to determine exactly where to insert the new text)
      */
      * rule text begins (this value is added to this substitution's
      * position to determine exactly where to insert the new text)
      */

-    virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos) const;
+    virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;

     
 protected:
     /**
     
 protected:
     /**


@@ -188,6 +191,7 @@ public:
         double baseValue,
         double upperBound, 
         UBool lenientParse,
         double baseValue,
         double upperBound, 
         UBool lenientParse,

+        uint32_t nonNumericalExecutedRuleMask,

         Formattable& result) const;
     
     /**
         Formattable& result) const;
     
     /**


@@ -232,14 +236,6 @@ public:
      */
     virtual UChar tokenChar() const = 0;
     
      */
     virtual UChar tokenChar() const = 0;
     

-    /**
-     * Returns true if this is a null substitution.  (We didn't do this
-     * with instanceof partially because it causes source files to
-     * proliferate and partially because we have to port this to C++.)
-     * @return true if this object is an instance of NullSubstitution
-     */
-    virtual UBool isNullSubstitution() const;
-    

     /**
      * Returns true if this is a modulus substitution.  (We didn't do this
      * with instanceof partially because it causes source files to
     /**
      * Returns true if this is a modulus substitution.  (We didn't do this
      * with instanceof partially because it causes source files to


@@ -248,6 +244,18 @@ public:
      */
     virtual UBool isModulusSubstitution() const;
     
      */
     virtual UBool isModulusSubstitution() const;
     

+    /**
+     * Apple addition
+     * @return true if this is a decimal format-only substitution
+     */
+    virtual UBool isDecimalFormatSubstitutionOnly() const;
+
+    /**
+     * Apple addition, not currently used
+     * @return true if this substitution only points to another ruleSet (no numberFormat)
+     */
+    //virtual UBool isRuleSetSubstitutionOnly() const;
+    

 private:
     NFSubstitution(const NFSubstitution &other); // forbid copying of this class
     NFSubstitution &operator=(const NFSubstitution &other); // forbid copying of this class
 private:
     NFSubstitution(const NFSubstitution &other); // forbid copying of this class
     NFSubstitution &operator=(const NFSubstitution &other); // forbid copying of this class