ICU 56 update step 1

source/i18n/nfsubs.cpp

 /*
 ******************************************************************************
-*   Copyright (C) 1997-2014, International Business Machines
+*   Copyright (C) 1997-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ******************************************************************************
 *   file name:  nfsubs.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 * Modification history
 * Date        Name      Comments
 * 10/11/2001  Doug      Ported from ICU4J
@@ skipping 27 matching lines @@
 {
     0x3E, 0x3E, 0
 }; /* ">>" */
 
 U_NAMESPACE_BEGIN
 
 class SameValueSubstitution : public NFSubstitution {
 public:
     SameValueSubstitution(int32_t pos,
         const NFRuleSet* ruleset,
-        const RuleBasedNumberFormat* formatter,
         const UnicodeString& description,
         UErrorCode& status);
     virtual ~SameValueSubstitution();
 
     virtual int64_t transformNumber(int64_t number) const { return number; }
     virtual double transformNumber(double number) const { return number; }
     virtual double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const { return newRuleValue; }
     virtual double calcUpperBound(double oldUpperBound) const { return oldUpperBound; }
     virtual UChar tokenChar() const { return (UChar)0x003d; } // '='
 
 public:
     static UClassID getStaticClassID(void);
     virtual UClassID getDynamicClassID(void) const;
 };
 
 SameValueSubstitution::~SameValueSubstitution() {}
 
 class MultiplierSubstitution : public NFSubstitution {
     double divisor;
     int64_t ldivisor;
 
 public:
     MultiplierSubstitution(int32_t _pos,
         double _divisor,
         const NFRuleSet* _ruleSet,
-        const RuleBasedNumberFormat* formatter,
         const UnicodeString& description,
         UErrorCode& status)
-        : NFSubstitution(_pos, _ruleSet, formatter, description, status), divisor(_divisor)
+        : NFSubstitution(_pos, _ruleSet, description, status), divisor(_divisor)
     {
         ldivisor = util64_fromDouble(divisor);
         if (divisor == 0) {
             status = U_PARSE_ERROR;
         }
     }
     virtual ~MultiplierSubstitution();
 
     virtual void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status) { 
         divisor = uprv_pow(radix, exponent);
@@ skipping 35 matching lines @@
 
 class ModulusSubstitution : public NFSubstitution {
     double divisor;
     int64_t  ldivisor;
     const NFRule* ruleToUse;
 public:
     ModulusSubstitution(int32_t pos,
         double _divisor,
         const NFRule* rulePredecessor,
         const NFRuleSet* ruleSet,
-        const RuleBasedNumberFormat* formatter,
         const UnicodeString& description,
         UErrorCode& status);
     virtual ~ModulusSubstitution();
 
     virtual void setDivisor(int32_t radix, int32_t exponent, UErrorCode& status) { 
         divisor = uprv_pow(radix, exponent);
         ldivisor = util64_fromDouble(divisor);
 
         if (divisor == 0) {
             status = U_PARSE_ERROR;
         }
     }
 
     virtual UBool operator==(const NFSubstitution& rhs) const;
 
-    virtual void doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t pos, UErrorCode& status) const;
-    virtual void doSubstitution(double 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;
+    virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
 
     virtual int64_t transformNumber(int64_t number) const { return number % ldivisor; }
     virtual double transformNumber(double number) const { return uprv_fmod(number, divisor); }
 
     virtual UBool doParse(const UnicodeString& text, 
         ParsePosition& parsePosition,
         double baseValue,
         double upperBound,
         UBool lenientParse,
         Formattable& result) const;
@@ skipping 14 matching lines @@
     static UClassID getStaticClassID(void);
     virtual UClassID getDynamicClassID(void) const;
 };
 
 ModulusSubstitution::~ModulusSubstitution() {}
 
 class IntegralPartSubstitution : public NFSubstitution {
 public:
     IntegralPartSubstitution(int32_t _pos,
         const NFRuleSet* _ruleSet,
-        const RuleBasedNumberFormat* formatter,
         const UnicodeString& description,
         UErrorCode& status)
-        : NFSubstitution(_pos, _ruleSet, formatter, description, status) {}
+        : NFSubstitution(_pos, _ruleSet, description, status) {}
     virtual ~IntegralPartSubstitution();
 
     virtual int64_t transformNumber(int64_t number) const { return number; }
     virtual double transformNumber(double number) const { return uprv_floor(number); }
     virtual double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue + oldRuleValue; }
     virtual double calcUpperBound(double /*oldUpperBound*/) const { return DBL_MAX; }
     virtual UChar tokenChar() const { return (UChar)0x003c; } // '<'
 
 public:
     static UClassID getStaticClassID(void);
     virtual UClassID getDynamicClassID(void) const;
 };
 
 IntegralPartSubstitution::~IntegralPartSubstitution() {}
 
 class FractionalPartSubstitution : public NFSubstitution {
     UBool byDigits;
     UBool useSpaces;
     enum { kMaxDecimalDigits = 8 };
 public:
     FractionalPartSubstitution(int32_t pos,
         const NFRuleSet* ruleSet,
-        const RuleBasedNumberFormat* formatter,
         const UnicodeString& description,
         UErrorCode& status);
     virtual ~FractionalPartSubstitution();
 
     virtual UBool operator==(const NFSubstitution& rhs) const;
 
-    virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos, UErrorCode& status) const;
-    virtual void doSubstitution(int64_t /*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;
+    virtual void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/, int32_t /*recursionCount*/, UErrorCode& /*status*/) const {}
     virtual int64_t transformNumber(int64_t /*number*/) const { return 0; }
     virtual double transformNumber(double number) const { return number - uprv_floor(number); }
 
     virtual UBool doParse(const UnicodeString& text,
         ParsePosition& parsePosition,
         double baseValue,
         double upperBound,
         UBool lenientParse,
         Formattable& result) const;
 
     virtual double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue + oldRuleValue; }
     virtual double calcUpperBound(double /*oldUpperBound*/) const { return 0.0; }
     virtual UChar tokenChar() const { return (UChar)0x003e; } // '>'
 
 public:
     static UClassID getStaticClassID(void);
     virtual UClassID getDynamicClassID(void) const;
 };
 
 FractionalPartSubstitution::~FractionalPartSubstitution() {}
 
 class AbsoluteValueSubstitution : public NFSubstitution {
 public:
     AbsoluteValueSubstitution(int32_t _pos,
         const NFRuleSet* _ruleSet,
-        const RuleBasedNumberFormat* formatter,
         const UnicodeString& description,
         UErrorCode& status)
-        : NFSubstitution(_pos, _ruleSet, formatter, description, status) {}
+        : NFSubstitution(_pos, _ruleSet, description, status) {}
     virtual ~AbsoluteValueSubstitution();
 
     virtual int64_t transformNumber(int64_t number) const { return number >= 0 ? number : -number; }
     virtual double transformNumber(double number) const { return uprv_fabs(number); }
     virtual double composeRuleValue(double newRuleValue, double /*oldRuleValue*/) const { return -newRuleValue; }
     virtual double calcUpperBound(double /*oldUpperBound*/) const { return DBL_MAX; }
     virtual UChar tokenChar() const { return (UChar)0x003e; } // '>'
 
 public:
     static UClassID getStaticClassID(void);
     virtual UClassID getDynamicClassID(void) const;
 };
 
 AbsoluteValueSubstitution::~AbsoluteValueSubstitution() {}
 
 class NumeratorSubstitution : public NFSubstitution {
     double denominator;
     int64_t ldenominator;
     UBool withZeros;
 public:
     static inline UnicodeString fixdesc(const UnicodeString& desc) {
         if (desc.endsWith(LTLT, 2)) {
             UnicodeString result(desc, 0, desc.length()-1);
             return result;
         }
         return desc;
     }
     NumeratorSubstitution(int32_t _pos,
         double _denominator,
-        const NFRuleSet* _ruleSet,
-        const RuleBasedNumberFormat* formatter,
+        NFRuleSet* _ruleSet,
         const UnicodeString& description,
         UErrorCode& status)
-        : NFSubstitution(_pos, _ruleSet, formatter, fixdesc(description), status), denominator(_denominator) 
+        : NFSubstitution(_pos, _ruleSet, fixdesc(description), status), denominator(_denominator) 
     {
         ldenominator = util64_fromDouble(denominator);
         withZeros = description.endsWith(LTLT, 2);
     }
     virtual ~NumeratorSubstitution();
 
     virtual UBool operator==(const NFSubstitution& rhs) const;
 
     virtual int64_t transformNumber(int64_t number) const { return number * ldenominator; }
     virtual double transformNumber(double number) const { return uprv_round(number * denominator); }
 
-    virtual void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/, UErrorCode& /*status*/) const {}
-    virtual void doSubstitution(double 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 {}
+    virtual void doSubstitution(double number, UnicodeString& toInsertInto, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
     virtual UBool doParse(const UnicodeString& text, 
         ParsePosition& parsePosition,
         double baseValue,
         double upperBound,
         UBool /*lenientParse*/,
         Formattable& result) const;
 
     virtual double composeRuleValue(double newRuleValue, double oldRuleValue) const { return newRuleValue / oldRuleValue; }
     virtual double calcUpperBound(double /*oldUpperBound*/) const { return denominator; }
     virtual UChar tokenChar() const { return (UChar)0x003c; } // '<'
 private:
     static const UChar LTLT[2];
 
 public:
     static UClassID getStaticClassID(void);
     virtual UClassID getDynamicClassID(void) const;
 };
 
 NumeratorSubstitution::~NumeratorSubstitution() {}
 
-class NullSubstitution : public NFSubstitution {
-public:
-    NullSubstitution(int32_t _pos,
-        const NFRuleSet* _ruleSet,
-        const RuleBasedNumberFormat* formatter,
-        const UnicodeString& description,
-        UErrorCode& status)
-        : NFSubstitution(_pos, _ruleSet, formatter, description, status) {}
-    virtual ~NullSubstitution();
-
-    virtual void toString(UnicodeString& /*result*/) const {}
-    virtual void doSubstitution(double /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/, UErrorCode& /*status*/) const {}
-    virtual void doSubstitution(int64_t /*number*/, UnicodeString& /*toInsertInto*/, int32_t /*_pos*/, UErrorCode& /*status*/) const {}
-    virtual int64_t transformNumber(int64_t /*number*/) const { return 0; }
-    virtual double transformNumber(double /*number*/) const { return 0; }
-    virtual UBool doParse(const UnicodeString& /*text*/,
-        ParsePosition& /*parsePosition*/, 
-        double baseValue,
-        double /*upperBound*/,
-        UBool /*lenientParse*/,
-        Formattable& result) const
-    { result.setDouble(baseValue); return TRUE; }
-    virtual double composeRuleValue(double /*newRuleValue*/, double /*oldRuleValue*/) const { return 0.0; } // never called
-    virtual double calcUpperBound(double /*oldUpperBound*/) const { return 0; } // never called
-    virtual UBool isNullSubstitution() const { return TRUE; }
-    virtual UChar tokenChar() const { return (UChar)0x0020; } // ' ' never called
-
-public:
-    static UClassID getStaticClassID(void);
-    virtual UClassID getDynamicClassID(void) const;
-};
-
-NullSubstitution::~NullSubstitution() {}
-
 NFSubstitution*
 NFSubstitution::makeSubstitution(int32_t pos,
                                  const NFRule* rule,
                                  const NFRule* predecessor,
                                  const NFRuleSet* ruleSet,
                                  const RuleBasedNumberFormat* formatter,
                                  const UnicodeString& description,
                                  UErrorCode& status)
 {
     // if the description is empty, return a NullSubstitution
     if (description.length() == 0) {
-        return new NullSubstitution(pos, ruleSet, formatter, description, status);
+        return NULL;
     }
 
     switch (description.charAt(0)) {
         // if the description begins with '<'...
     case gLessThan:
         // throw an exception if the rule is a negative number
         // rule
         if (rule->getBaseValue() == NFRule::kNegativeNumberRule) {
             // throw new IllegalArgumentException("<< not allowed in negative-number rule");
             status = U_PARSE_ERROR;
             return NULL;
         }
 
         // if the rule is a fraction rule, return an
         // IntegralPartSubstitution
         else if (rule->getBaseValue() == NFRule::kImproperFractionRule
             || rule->getBaseValue() == NFRule::kProperFractionRule
             || rule->getBaseValue() == NFRule::kMasterRule) {
-            return new IntegralPartSubstitution(pos, ruleSet, formatter, description, status);
+            return new IntegralPartSubstitution(pos, ruleSet, description, status);
         }
 
         // if the rule set containing the rule is a fraction
         // rule set, return a NumeratorSubstitution
         else if (ruleSet->isFractionRuleSet()) {
             return new NumeratorSubstitution(pos, (double)rule->getBaseValue(),
-                formatter->getDefaultRuleSet(), formatter, description, status);
+                formatter->getDefaultRuleSet(), description, status);
         }
 
         // otherwise, return a MultiplierSubstitution
         else {
             return new MultiplierSubstitution(pos, rule->getDivisor(), ruleSet,
-                formatter, description, status);
+                description, status);
         }
 
         // if the description begins with '>'...
     case gGreaterThan:
         // if the rule is a negative-number rule, return
         // an AbsoluteValueSubstitution
         if (rule->getBaseValue() == NFRule::kNegativeNumberRule) {
-            return new AbsoluteValueSubstitution(pos, ruleSet, formatter, description, status);
+            return new AbsoluteValueSubstitution(pos, ruleSet, description, status);
         }
 
         // if the rule is a fraction rule, return a
         // FractionalPartSubstitution
         else if (rule->getBaseValue() == NFRule::kImproperFractionRule
             || rule->getBaseValue() == NFRule::kProperFractionRule
             || rule->getBaseValue() == NFRule::kMasterRule) {
-            return new FractionalPartSubstitution(pos, ruleSet, formatter, description, status);
+            return new FractionalPartSubstitution(pos, ruleSet, description, status);
         }
 
         // if the rule set owning the rule is a fraction rule set,
         // throw an exception
         else if (ruleSet->isFractionRuleSet()) {
             // throw new IllegalArgumentException(">> not allowed in fraction rule set");
             status = U_PARSE_ERROR;
             return NULL;
         }
 
         // otherwise, return a ModulusSubstitution
         else {
             return new ModulusSubstitution(pos, rule->getDivisor(), predecessor,
-                ruleSet, formatter, description, status);
+                ruleSet, description, status);
         }
 
         // if the description begins with '=', always return a
         // SameValueSubstitution
     case gEquals:
-        return new SameValueSubstitution(pos, ruleSet, formatter, description, status);
+        return new SameValueSubstitution(pos, ruleSet, description, status);
 
         // and if it's anything else, throw an exception
     default:
         // throw new IllegalArgumentException("Illegal substitution character");
         status = U_PARSE_ERROR;
     }
     return NULL;
 }
 
 NFSubstitution::NFSubstitution(int32_t _pos,
                                const NFRuleSet* _ruleSet,
-                               const RuleBasedNumberFormat* formatter,
                                const UnicodeString& description,
                                UErrorCode& status)
                                : pos(_pos), ruleSet(NULL), numberFormat(NULL)
 {
     // the description should begin and end with the same character.
     // If it doesn't that's a syntax error.  Otherwise,
     // makeSubstitution() was the only thing that needed to know
     // about these characters, so strip them off
     UnicodeString workingDescription(description);
     if (description.length() >= 2
         && description.charAt(0) == description.charAt(description.length() - 1))
     {
         workingDescription.remove(description.length() - 1, 1);
         workingDescription.remove(0, 1);
     }
     else if (description.length() != 0) {
         // throw new IllegalArgumentException("Illegal substitution syntax");
         status = U_PARSE_ERROR;
         return;
     }
 
-    // if the description was just two paired token characters
-    // (i.e., "<<" or ">>"), it uses the rule set it belongs to to
-    // format its result
     if (workingDescription.length() == 0) {
+        // if the description was just two paired token characters
+        // (i.e., "<<" or ">>"), it uses the rule set it belongs to to
+        // format its result
         this->ruleSet = _ruleSet;
     }
-    // if the description contains a rule set name, that's the rule
-    // set we use to format the result: get a reference to the
-    // names rule set
     else if (workingDescription.charAt(0) == gPercent) {
-        this->ruleSet = formatter->findRuleSet(workingDescription, status);
+        // if the description contains a rule set name, that's the rule
+        // set we use to format the result: get a reference to the
+        // names rule set
+        this->ruleSet = _ruleSet->getOwner()->findRuleSet(workingDescription, status);
     }
-    // if the description begins with 0 or #, treat it as a
-    // DecimalFormat pattern, and initialize a DecimalFormat with
-    // that pattern (then set it to use the DecimalFormatSymbols
-    // belonging to our formatter)
     else if (workingDescription.charAt(0) == gPound || workingDescription.charAt(0) ==gZero) {
-        DecimalFormatSymbols* sym = formatter->getDecimalFormatSymbols();
+        // if the description begins with 0 or #, treat it as a
+        // DecimalFormat pattern, and initialize a DecimalFormat with
+        // that pattern (then set it to use the DecimalFormatSymbols
+        // belonging to our formatter)
+        const DecimalFormatSymbols* sym = _ruleSet->getOwner()->getDecimalFormatSymbols();
         if (!sym) {
             status = U_MISSING_RESOURCE_ERROR;
             return;
         }
-        this->numberFormat = new DecimalFormat(workingDescription, *sym, status);
+        DecimalFormat *tempNumberFormat = new DecimalFormat(workingDescription, *sym, status);
         /* test for NULL */
-        if (this->numberFormat == 0) {
+        if (!tempNumberFormat) {
             status = U_MEMORY_ALLOCATION_ERROR;
             return;
         }
         if (U_FAILURE(status)) {
-            delete (DecimalFormat*)this->numberFormat;
-            this->numberFormat = NULL;
+            delete tempNumberFormat;
             return;
         }
-        // this->numberFormat->setDecimalFormatSymbols(formatter->getDecimalFormatSymbols());
+        this->numberFormat = tempNumberFormat;
     }
-    // if the description is ">>>", this substitution bypasses the
-    // usual rule-search process and always uses the rule that precedes
-    // it in its own rule set's rule list (this is used for place-value
-    // notations: formats where you want to see a particular part of
-    // a number even when it's 0)
     else if (workingDescription.charAt(0) == gGreaterThan) {
+        // if the description is ">>>", this substitution bypasses the
+        // usual rule-search process and always uses the rule that precedes
+        // it in its own rule set's rule list (this is used for place-value
+        // notations: formats where you want to see a particular part of
+        // a number even when it's 0)
+
         // this causes problems when >>> is used in a frationalPartSubstitution
         // this->ruleSet = NULL;
         this->ruleSet = _ruleSet;
         this->numberFormat = NULL;
     }
-    // and of the description is none of these things, it's a syntax error
     else {
+        // and of the description is none of these things, it's a syntax error
+
         // throw new IllegalArgumentException("Illegal substitution syntax");
         status = U_PARSE_ERROR;
     }
 }
 
 NFSubstitution::~NFSubstitution()
 {
-  // cast away const
-  delete (NumberFormat*)numberFormat; numberFormat = NULL;
+    delete numberFormat;
+    numberFormat = NULL;
 }
 
 /**
  * Set's the substitution's divisor.  Used by NFRule.setBaseValue().
  * A no-op for all substitutions except multiplier and modulus
  * substitutions.
  * @param radix The radix of the divisor
  * @param exponent The exponent of the divisor
  */
 void
 NFSubstitution::setDivisor(int32_t /*radix*/, int32_t /*exponent*/, UErrorCode& /*status*/) {
   // a no-op for all substitutions except multiplier and modulus substitutions
 }
 
+void
+NFSubstitution::setDecimalFormatSymbols(const DecimalFormatSymbols &newSymbols, UErrorCode& /*status*/) {
+    if (numberFormat != NULL) {
+        numberFormat->setDecimalFormatSymbols(newSymbols);
+    }
+}
 
 //-----------------------------------------------------------------------
 // boilerplate
 //-----------------------------------------------------------------------
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(NFSubstitution)
 
 /**
  * Compares two substitutions for equality
  * @param The substitution to compare this one to
@@ skipping 48 matching lines @@
  * 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)
  */
 void
-NFSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t _pos, UErrorCode& status) const
+NFSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t _pos, int32_t recursionCount, UErrorCode& status) const
 {
     if (ruleSet != NULL) {
         // perform a transformation on the number that is dependent
         // on the type of substitution this is, then just call its
         // rule set's format() method to format the result
-        ruleSet->format(transformNumber(number), toInsertInto, _pos + this->pos, status);
+        ruleSet->format(transformNumber(number), toInsertInto, _pos + this->pos, recursionCount, status);
     } else if (numberFormat != NULL) {
         // or perform the transformation on the number (preserving
         // the result's fractional part if the formatter it set
         // to show it), then use that formatter's format() method
         // to format the result
         double numberToFormat = transformNumber((double)number);
         if (numberFormat->getMaximumFractionDigits() == 0) {
             numberToFormat = uprv_floor(numberToFormat);
         }
 
         UnicodeString temp;
         numberFormat->format(numberToFormat, temp, status);
         toInsertInto.insert(_pos + this->pos, temp);
     }
 }
 
 /**
  * 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)
  */
 void
-NFSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t _pos, UErrorCode& status) const {
+NFSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t _pos, int32_t recursionCount, UErrorCode& status) const {
     // perform a transformation on the number being formatted that
     // is dependent on the type of substitution this is
     double numberToFormat = transformNumber(number);
 
+    if (uprv_isInfinite(numberToFormat)) {
+        // This is probably a minus rule. Combine it with an infinite rule.
+        const NFRule *infiniteRule = ruleSet->findDoubleRule(uprv_getInfinity());
+        infiniteRule->doFormat(numberToFormat, toInsertInto, _pos + this->pos, recursionCount, status);
+        return;
+    }
+
     // if the result is an integer, from here on out we work in integer
     // space (saving time and memory and preserving accuracy)
     if (numberToFormat == uprv_floor(numberToFormat) && ruleSet != NULL) {
-        ruleSet->format(util64_fromDouble(numberToFormat), toInsertInto, _pos + this->pos, status);
+        ruleSet->format(util64_fromDouble(numberToFormat), toInsertInto, _pos + this->pos, recursionCount, status);
 
         // if the result isn't an integer, then call either our rule set's
         // format() method or our DecimalFormat's format() method to
         // format the result
     } else {
         if (ruleSet != NULL) {
-            ruleSet->format(numberToFormat, toInsertInto, _pos + this->pos, status);
+            ruleSet->format(numberToFormat, toInsertInto, _pos + this->pos, recursionCount, status);
         } else if (numberFormat != NULL) {
             UnicodeString temp;
             numberFormat->format(numberToFormat, temp);
             toInsertInto.insert(_pos + this->pos, temp);
         }
     }
 }
 
 
     //-----------------------------------------------------------------------
@@ skipping 107 matching lines @@
         tempResult = composeRuleValue(tempResult, baseValue);
         result.setDouble(tempResult);
         return TRUE;
         // if the parse was UNsuccessful, return 0
     } else {
         result.setLong(0);
         return FALSE;
     }
 }
 
-UBool
-NFSubstitution::isNullSubstitution() const {
-    return FALSE;
-}
-
     /**
      * 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
      */
 UBool
 NFSubstitution::isModulusSubstitution() const {
     return FALSE;
 }
 
 //===================================================================
 // SameValueSubstitution
 //===================================================================
 
 /**
  * A substitution that passes the value passed to it through unchanged.
  * Represented by == in rule descriptions.
  */
 SameValueSubstitution::SameValueSubstitution(int32_t _pos,
                         const NFRuleSet* _ruleSet,
-                        const RuleBasedNumberFormat* formatter,
                         const UnicodeString& description,
                         UErrorCode& status)
-: NFSubstitution(_pos, _ruleSet, formatter, description, status)
+: NFSubstitution(_pos, _ruleSet, description, status)
 {
     if (0 == description.compare(gEqualsEquals, 2)) {
         // throw new IllegalArgumentException("== is not a legal token");
         status = U_PARSE_ERROR;
     }
 }
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SameValueSubstitution)
 
 //===================================================================
@@ skipping 15 matching lines @@
 
 /**
  * A substitution that divides the number being formatted by the its rule's
  * divisor and formats the remainder.  Represented by "&gt;&gt;" in a
  * regular rule.
  */
 ModulusSubstitution::ModulusSubstitution(int32_t _pos,
                                          double _divisor,
                                          const NFRule* predecessor,
                                          const NFRuleSet* _ruleSet,
-                                         const RuleBasedNumberFormat* formatter,
                                          const UnicodeString& description,
                                          UErrorCode& status)
- : NFSubstitution(_pos, _ruleSet, formatter, description, status)
+ : NFSubstitution(_pos, _ruleSet, description, status)
  , divisor(_divisor)
  , ruleToUse(NULL)
 {
   ldivisor = util64_fromDouble(_divisor);
 
   // the owning rule's divisor controls the behavior of this
   // substitution: rather than keeping a backpointer to the rule,
   // we keep a copy of the divisor
 
   if (ldivisor == 0) {
@@ skipping 26 matching lines @@
 
 /**
  * If this is a &gt;&gt;&gt; substitution, use ruleToUse to fill in
  * the substitution.  Otherwise, just use the superclass function.
  * @param number The number being formatted
  * @toInsertInto The string to insert the result of this substitution
  * into
  * @param pos The position of the rule text in toInsertInto
  */
 void
-ModulusSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t _pos, UErrorCode& status) const
+ModulusSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t _pos, int32_t recursionCount, UErrorCode& status) const
 {
     // if this isn't a >>> substitution, just use the inherited version
     // of this function (which uses either a rule set or a DecimalFormat
     // to format its substitution value)
     if (ruleToUse == NULL) {
-        NFSubstitution::doSubstitution(number, toInsertInto, _pos, status);
+        NFSubstitution::doSubstitution(number, toInsertInto, _pos, recursionCount, status);
 
         // a >>> substitution goes straight to a particular rule to
         // format the substitution value
     } else {
         int64_t numberToFormat = transformNumber(number);
-        ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos(), status);
+        ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos(), recursionCount, status);
     }
 }
 
 /**
 * If this is a &gt;&gt;&gt; substitution, use ruleToUse to fill in
 * the substitution.  Otherwise, just use the superclass function.
 * @param number The number being formatted
 * @toInsertInto The string to insert the result of this substitution
 * into
 * @param pos The position of the rule text in toInsertInto
 */
 void
-ModulusSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t _pos, UErrorCode& status) const
+ModulusSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t _pos, int32_t recursionCount, UErrorCode& status) const
 {
     // if this isn't a >>> substitution, just use the inherited version
     // of this function (which uses either a rule set or a DecimalFormat
     // to format its substitution value)
     if (ruleToUse == NULL) {
-        NFSubstitution::doSubstitution(number, toInsertInto, _pos, status);
+        NFSubstitution::doSubstitution(number, toInsertInto, _pos, recursionCount, status);
 
         // a >>> substitution goes straight to a particular rule to
         // format the substitution value
     } else {
         double numberToFormat = transformNumber(number);
 
-        ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos(), status);
+        ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos(), recursionCount, status);
     }
 }
 
 //-----------------------------------------------------------------------
 // parsing
 //-----------------------------------------------------------------------
 
 /**
  * If this is a &gt;&gt;&gt; substitution, match only against ruleToUse.
  * Otherwise, use the superclass function.
@@ skipping 67 matching lines @@
 //===================================================================
 
 
     /**
      * Constructs a FractionalPartSubstitution.  This object keeps a flag
      * telling whether it should format by digits or not.  In addition,
      * it marks the rule set it calls (if any) as a fraction rule set.
      */
 FractionalPartSubstitution::FractionalPartSubstitution(int32_t _pos,
                              const NFRuleSet* _ruleSet,
-                             const RuleBasedNumberFormat* formatter,
                              const UnicodeString& description,
                              UErrorCode& status)
- : NFSubstitution(_pos, _ruleSet, formatter, description, status)
+ : NFSubstitution(_pos, _ruleSet, description, status)
  , byDigits(FALSE)
  , useSpaces(TRUE)
 
 {
     // akk, ruleSet can change in superclass constructor
     if (0 == description.compare(gGreaterGreaterThan, 2) ||
         0 == description.compare(gGreaterGreaterGreaterThan, 3) ||
         _ruleSet == getRuleSet()) {
         byDigits = TRUE;
         if (0 == description.compare(gGreaterGreaterGreaterThan, 3)) {
@@ skipping 14 matching lines @@
  * at a time using the rule set containing this substitution.
  * Otherwise, uses the superclass function.
  * @param number The number being formatted
  * @param toInsertInto The string to insert the result of formatting
  * the substitution into
  * @param pos The position of the owning rule's rule text in
  * toInsertInto
  */
 void
 FractionalPartSubstitution::doSubstitution(double number, UnicodeString& toInsertInto,
-                                           int32_t _pos, UErrorCode& status) const
+                                           int32_t _pos, int32_t recursionCount, UErrorCode& status) const
 {
   // if we're not in "byDigits" mode, just use the inherited
   // doSubstitution() routine
   if (!byDigits) {
-    NFSubstitution::doSubstitution(number, toInsertInto, _pos, status);
+    NFSubstitution::doSubstitution(number, toInsertInto, _pos, recursionCount, status);
 
     // if we're in "byDigits" mode, transform the value into an integer
     // by moving the decimal point eight places to the right and
     // pulling digits off the right one at a time, formatting each digit
     // as an integer using this substitution's owning rule set
     // (this is slower, but more accurate, than doing it from the
     // other end)
   } else {
     //          int32_t numberToFormat = (int32_t)uprv_round(transformNumber(number) * uprv_pow(10, kMaxDecimalDigits));
     //          // this flag keeps us from formatting trailing zeros.  It starts
@@ skipping 21 matching lines @@
     for (int32_t didx = dl.getCount()-1; didx>=dl.getDecimalAt(); didx--) {
       // Loop iterates over fraction digits, starting with the LSD.
       //   include both real digits from the number, and zeros
       //   to the left of the MSD but to the right of the decimal point.
       if (pad && useSpaces) {
         toInsertInto.insert(_pos + getPos(), gSpace);
       } else {
         pad = TRUE;
       }
       int64_t digit = didx>=0 ? dl.getDigit(didx) - '0' : 0;
-      getRuleSet()->format(digit, toInsertInto, _pos + getPos(), status);
+      getRuleSet()->format(digit, toInsertInto, _pos + getPos(), recursionCount, status);
     }
 
     if (!pad) {
       // hack around lack of precision in digitlist. if we would end up with
       // "foo point" make sure we add a " zero" to the end.
-      getRuleSet()->format((int64_t)0, toInsertInto, _pos + getPos(), status);
+      getRuleSet()->format((int64_t)0, toInsertInto, _pos + getPos(), recursionCount, status);
     }
   }
 }
 
 //-----------------------------------------------------------------------
 // parsing
 //-----------------------------------------------------------------------
 
 /**
  * If in "by digits" mode, parses the string as if it were a string
@@ skipping 98 matching lines @@
 // AbsoluteValueSubstitution
 //===================================================================
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(AbsoluteValueSubstitution)
 
 //===================================================================
 // NumeratorSubstitution
 //===================================================================
 
 void
-NumeratorSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t apos, UErrorCode& status) const {
+NumeratorSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t apos, int32_t recursionCount, UErrorCode& status) const {
     // perform a transformation on the number being formatted that
     // is dependent on the type of substitution this is
 
     double numberToFormat = transformNumber(number);
     int64_t longNF = util64_fromDouble(numberToFormat);
 
     const NFRuleSet* aruleSet = getRuleSet();
     if (withZeros && aruleSet != NULL) {
         // if there are leading zeros in the decimal expansion then emit them
         int64_t nf =longNF;
         int32_t len = toInsertInto.length();
         while ((nf *= 10) < denominator) {
             toInsertInto.insert(apos + getPos(), gSpace);
-            aruleSet->format((int64_t)0, toInsertInto, apos + getPos(), status);
+            aruleSet->format((int64_t)0, toInsertInto, apos + getPos(), recursionCount, status);
         }
         apos += toInsertInto.length() - len;
     }
 
     // if the result is an integer, from here on out we work in integer
     // space (saving time and memory and preserving accuracy)
     if (numberToFormat == longNF && aruleSet != NULL) {
-        aruleSet->format(longNF, toInsertInto, apos + getPos(), status);
+        aruleSet->format(longNF, toInsertInto, apos + getPos(), recursionCount, status);
 
         // if the result isn't an integer, then call either our rule set's
         // format() method or our DecimalFormat's format() method to
         // format the result
     } else {
         if (aruleSet != NULL) {
-            aruleSet->format(numberToFormat, toInsertInto, apos + getPos(), status);
+            aruleSet->format(numberToFormat, toInsertInto, apos + getPos(), recursionCount, status);
         } else {
             UnicodeString temp;
             getNumberFormat()->format(numberToFormat, temp, status);
             toInsertInto.insert(apos + getPos(), temp);
         }
     }
 }
 
 UBool 
 NumeratorSubstitution::doParse(const UnicodeString& text, 
@@ skipping 71 matching lines @@
 NumeratorSubstitution::operator==(const NFSubstitution& rhs) const
 {
     return NFSubstitution::operator==(rhs) &&
         denominator == ((const NumeratorSubstitution*)&rhs)->denominator;
 }
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(NumeratorSubstitution)
 
 const UChar NumeratorSubstitution::LTLT[] = { 0x003c, 0x003c };
         
-//===================================================================
-// NullSubstitution
-//===================================================================
-
-UOBJECT_DEFINE_RTTI_IMPLEMENTATION(NullSubstitution)
-
 U_NAMESPACE_END
 
 /* U_HAVE_RBNF */
 #endif