1 files changed, 29 insertions, 10 deletions

diff --git a/deps/icu-small/source/i18n/formattedval_impl.h b/deps/icu-small/source/i18n/formattedval_impl.h
index 69ba0922ed..4ee53e4589 100644
--- a/deps/icu-small/source/i18n/formattedval_impl.h
+++ b/deps/icu-small/source/i18n/formattedval_impl.h
@@ -18,7 +18,7 @@
 #include "fphdlimp.h"
 #include "util.h"
 #include "uvectr32.h"
-#include "number_stringbuilder.h"
+#include "formatted_string_builder.h"
 
 
 /**
@@ -67,7 +67,9 @@ typedef enum UCFPosConstraintType {
 U_NAMESPACE_BEGIN
 
 
-/** Implementation using FieldPositionHandler to accept fields. */
+/**
+ * Implementation of FormattedValue using FieldPositionHandler to accept fields.
+ */
 class FormattedValueFieldPositionIteratorImpl : public UMemory, public FormattedValue {
 public:
 
@@ -112,12 +114,21 @@ private:
 };
 
 
-class FormattedValueNumberStringBuilderImpl : public UMemory, public FormattedValue {
+/**
+ * Implementation of FormattedValue based on FormattedStringBuilder.
+ *
+ * The implementation currently revolves around numbers and number fields.
+ * However, it can be generalized in the future when there is a need.
+ *
+ * @author sffc (Shane Carr)
+ */
+// Exported as U_I18N_API for tests
+class U_I18N_API FormattedValueStringBuilderImpl : public UMemory, public FormattedValue {
 public:
 
-    FormattedValueNumberStringBuilderImpl(number::impl::Field numericField);
+    FormattedValueStringBuilderImpl(FormattedStringBuilder::Field numericField);
 
-    virtual ~FormattedValueNumberStringBuilderImpl();
+    virtual ~FormattedValueStringBuilderImpl();
 
     // Implementation of FormattedValue (const):
 
@@ -126,17 +137,25 @@ public:
     Appendable& appendTo(Appendable& appendable, UErrorCode& status) const U_OVERRIDE;
     UBool nextPosition(ConstrainedFieldPosition& cfpos, UErrorCode& status) const U_OVERRIDE;
 
-    inline number::impl::NumberStringBuilder& getStringRef() {
+    // Additional helper functions:
+    UBool nextFieldPosition(FieldPosition& fp, UErrorCode& status) const;
+    void getAllFieldPositions(FieldPositionIteratorHandler& fpih, UErrorCode& status) const;
+    inline FormattedStringBuilder& getStringRef() {
         return fString;
     }
-
-    inline const number::impl::NumberStringBuilder& getStringRef() const {
+    inline const FormattedStringBuilder& getStringRef() const {
         return fString;
     }
 
 private:
-    number::impl::NumberStringBuilder fString;
-    number::impl::Field fNumericField;
+    FormattedStringBuilder fString;
+    FormattedStringBuilder::Field fNumericField;
+
+    bool nextPositionImpl(ConstrainedFieldPosition& cfpos, FormattedStringBuilder::Field numericField, UErrorCode& status) const;
+    static bool isIntOrGroup(FormattedStringBuilder::Field field);
+    static bool isNumericField(FormattedStringBuilder::Field field);
+    int32_t trimBack(int32_t limit) const;
+    int32_t trimFront(int32_t start) const;
 };