ICU-62141.0.1.tar.gz

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

diff --git a/icuSources/i18n/nfrs.h b/icuSources/i18n/nfrs.h
index 769d3277efe8ed09e3ccd24c8578df66c6478240..9a3438a335db4333ef6ad64506a44ae487c84bc8 100644 (file)
--- a/icuSources/i18n/nfrs.h
+++ b/icuSources/i18n/nfrs.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-2014, International Business Machines
+*   Copyright (C) 1997-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ******************************************************************************
 *   file name:  nfrs.h
-*   encoding:   US-ASCII
+*   encoding:   UTF-8
 *   tab size:   8 (not used)
 *   indentation:4
 *
@@ -30,8 +32,10 @@ U_NAMESPACE_BEGIN
 
 class NFRuleSet : public UMemory {
 public:
-    NFRuleSet(UnicodeString* descriptions, int32_t index, UErrorCode& status);
-    void parseRules(UnicodeString& rules, const RuleBasedNumberFormat* owner, UErrorCode& status);
+    NFRuleSet(RuleBasedNumberFormat *owner, UnicodeString* descriptions, int32_t index, UErrorCode& status);
+    void parseRules(UnicodeString& rules, UErrorCode& status);
+    void setNonNumericalRule(NFRule *rule);
+    void setBestFractionRule(int32_t originalIndex, NFRule *newRule, UBool rememberRule);
     void makeIntoFractionRuleSet() { fIsFractionRuleSet = TRUE; }
 
     ~NFRuleSet();
@@ -55,27 +59,32 @@ public:
     void  getName(UnicodeString& result) const { result.setTo(name); }
     UBool isNamed(const UnicodeString& _name) const { return this->name == _name; }
 
-    void  format(int64_t number, UnicodeString& toAppendTo, int32_t pos, UErrorCode& status) const;
-    void  format(double number, UnicodeString& toAppendTo, int32_t pos, UErrorCode& status) const;
+    void  format(int64_t number, UnicodeString& toAppendTo, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
+    void  format(double number, UnicodeString& toAppendTo, int32_t pos, int32_t recursionCount, UErrorCode& status) const;
 
-    UBool parse(const UnicodeString& text, ParsePosition& pos, double upperBound, Formattable& result, UBool lenient=FALSE) const;
+    UBool parse(const UnicodeString& text, ParsePosition& pos, double upperBound, uint32_t nonNumericalExecutedRuleMask, Formattable& result, UBool lenient=FALSE) const;
 
     void appendRules(UnicodeString& result) const; // toString
 
+    void setDecimalFormatSymbols(const DecimalFormatSymbols &newSymbols, UErrorCode& status);
+
+    const RuleBasedNumberFormat *getOwner() const { return owner; }
 private:
-    NFRule * findNormalRule(int64_t number) const;
-    NFRule * findDoubleRule(double number) const;
-    NFRule * findFractionRuleSetRule(double number) const;
+    const NFRule * findNormalRule(int64_t number) const;
+    const NFRule * findDoubleRule(double number) const;
+    const NFRule * findFractionRuleSetRule(double number) const;
+    
+    friend class NFSubstitution;
 
 private:
     UnicodeString name;
     NFRuleList rules;
-    NFRule *negativeNumberRule;
-    NFRule *fractionRules[3];
+    NFRule *nonNumericalRules[6];
+    RuleBasedNumberFormat *owner;
+    NFRuleList fractionRules;
     UBool fIsFractionRuleSet;
     UBool fIsPublic;
     UBool fIsParseable;
-    int32_t fRecursionCount;
 
     NFRuleSet(const NFRuleSet &other); // forbid copying of this class
     NFRuleSet &operator=(const NFRuleSet &other); // forbid copying of this class
@@ -86,7 +95,9 @@ private:
 int64_t util64_fromDouble(double d);
 
 // raise radix to the power exponent, only non-negative exponents
-int64_t util64_pow(int32_t radix, uint32_t exponent);
+// Arithmetic is performed in unsigned space since overflow in
+// signed space is undefined behavior.
+uint64_t util64_pow(uint32_t radix, uint16_t exponent);
 
 // convert n to digit string in buffer, return length of string
 uint32_t util64_tou(int64_t n, UChar* buffer, uint32_t buflen, uint32_t radix = 10, UBool raw = FALSE);
@@ -105,4 +116,3 @@ U_NAMESPACE_END
 
 // NFRS_H
 #endif
-