ICU 56 update step 1

source/i18n/nfsubs.h

 /*
 ******************************************************************************
-*   Copyright (C) 1997-2014, International Business Machines
+*   Copyright (C) 1997-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ******************************************************************************
 *   file name:  nfsubs.h
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 * Modification history
 * Date        Name      Comments
 * 10/11/2001  Doug      Ported from ICU4J
@@ skipping 11 matching lines @@
 #include "unicode/utypes.h"
 #include "unicode/decimfmt.h"
 #include "nfrs.h"
 #include <float.h>
 
 U_NAMESPACE_BEGIN
 
 class NFSubstitution : public UObject {
     int32_t pos;
     const NFRuleSet* ruleSet;
-    const DecimalFormat* numberFormat;
+    DecimalFormat* numberFormat;
     
 protected:
     NFSubstitution(int32_t pos,
         const NFRuleSet* ruleSet,
-        const RuleBasedNumberFormat* rbnf,
         const UnicodeString& description,
         UErrorCode& status);
     
     /**
      * Get the Ruleset of the object.
      * @return the Ruleset of the object.
      */
     const NFRuleSet* getRuleSet() const { return ruleSet; }
 
     /**
@@ skipping 40 matching lines @@
      * @param exponent The exponent of the divisor
      */
     virtual void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status);
     
     /**
      * Replaces result with the string describing the substitution.
      * @param result    Output param which will receive the string.
      */
     virtual void toString(UnicodeString& result) const;
     
+    void setDecimalFormatSymbols(const DecimalFormatSymbols &newSymbols, UErrorCode& status);
+
     //-----------------------------------------------------------------------
     // formatting
     //-----------------------------------------------------------------------
     
     /**
      * Performs a mathematical operation on the number, formats it using
      * either ruleSet or decimalFormat, and inserts the result into
      * toInsertInto.
      * @param number The number being formatted.
      * @param toInsertInto The string we insert the result into
      * @param pos The position in toInsertInto where the owning rule's
      * 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, UErrorCode& status) 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
      * either ruleSet or decimalFormat, and inserts the result into
      * toInsertInto.
      * @param number The number being formatted.
      * @param toInsertInto The string we insert the result into
      * @param pos The position in toInsertInto where the owning rule's
      * 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, UErrorCode& status) const;
+    virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
     
 protected:
     /**
      * Subclasses override this function to perform some kind of
      * mathematical operation on the number.  The result of this operation
      * is formatted using the rule set or DecimalFormat that this
      * substitution refers to, and the result is inserted into the result
      * string.
      * @param The number being formatted
      * @return The result of performing the opreration on the number
@@ skipping 88 matching lines @@
     int32_t getPos() const { return pos; }
     
     /**
      * Returns the character used in the textual representation of
      * substitutions of this type.  Used by toString().
      * @return This substitution's token character.
      */
     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
      * proliferate and partially because we have to port this to C++.)
      * @return true if this object is an instance of ModulusSubstitution
      */
     virtual UBool isModulusSubstitution() const;
     
 private:
     NFSubstitution(const NFSubstitution &other); // forbid copying of this class
     NFSubstitution &operator=(const NFSubstitution &other); // forbid copying of this class
 
 public:
     static UClassID getStaticClassID(void);
     virtual UClassID getDynamicClassID(void) const;
 };
 
 U_NAMESPACE_END
 
 /* U_HAVE_RBNF */
 #endif
 
 // NFSUBS_H
 #endif