ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / msgfmt.cpp

diff --git a/icuSources/i18n/msgfmt.cpp b/icuSources/i18n/msgfmt.cpp
index b529246683eb12566fcd0d173fecab3077c1ec57..1fe2c8d622e04be9dfba3bb2fb6511a17f3d0530 100644 (file)
--- a/icuSources/i18n/msgfmt.cpp
+++ b/icuSources/i18n/msgfmt.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT:
 /********************************************************************
  * COPYRIGHT:

- * Copyright (c) 1997-2010, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and

  * others. All Rights Reserved.
  ********************************************************************
  *
  * others. All Rights Reserved.
  ********************************************************************
  *


@@ -23,41 +23,43 @@
 
 #if !UCONFIG_NO_FORMATTING
 
 
 #if !UCONFIG_NO_FORMATTING
 

-#include "unicode/msgfmt.h"
-#include "unicode/decimfmt.h"
-#include "unicode/datefmt.h"
-#include "unicode/smpdtfmt.h"
+#include "unicode/appendable.h"

 #include "unicode/choicfmt.h"
 #include "unicode/choicfmt.h"

+#include "unicode/datefmt.h"
+#include "unicode/decimfmt.h"
+#include "unicode/localpointer.h"
+#include "unicode/msgfmt.h"

 #include "unicode/plurfmt.h"
 #include "unicode/plurfmt.h"

+#include "unicode/rbnf.h"

 #include "unicode/selfmt.h"
 #include "unicode/selfmt.h"

-#include "unicode/ustring.h"
-#include "unicode/ucnv_err.h"
-#include "unicode/uchar.h"
+#include "unicode/smpdtfmt.h"

 #include "unicode/umsg.h"
 #include "unicode/umsg.h"

-#include "unicode/rbnf.h"
+#include "unicode/ustring.h"

 #include "cmemory.h"
 #include "cmemory.h"

+#include "patternprops.h"
+#include "messageimpl.h"

 #include "msgfmt_impl.h"
 #include "msgfmt_impl.h"

-#include "util.h"
+#include "plurrule_impl.h"

 #include "uassert.h"
 #include "uassert.h"

+#include "uelement.h"
+#include "uhash.h"

 #include "ustrfmt.h"
 #include "ustrfmt.h"

+#include "util.h"

 #include "uvector.h"
 #include "uvector.h"

+#include "visibledigits.h"

 
 // *****************************************************************************
 // class MessageFormat
 // *****************************************************************************
 
 
 // *****************************************************************************
 // class MessageFormat
 // *****************************************************************************
 

-#define COMMA             ((UChar)0x002C)

 #define SINGLE_QUOTE      ((UChar)0x0027)
 #define SINGLE_QUOTE      ((UChar)0x0027)

+#define COMMA             ((UChar)0x002C)

 #define LEFT_CURLY_BRACE  ((UChar)0x007B)
 #define RIGHT_CURLY_BRACE ((UChar)0x007D)
 
 //---------------------------------------
 // static data
 
 #define LEFT_CURLY_BRACE  ((UChar)0x007B)
 #define RIGHT_CURLY_BRACE ((UChar)0x007D)
 
 //---------------------------------------
 // static data
 

-static const UChar ID_EMPTY[]     = {
-    0 /* empty string, used for default so that null can mark end of list */
-};
-

 static const UChar ID_NUMBER[]    = {
     0x6E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0  /* "number" */
 };
 static const UChar ID_NUMBER[]    = {
     0x6E, 0x75, 0x6D, 0x62, 0x65, 0x72, 0  /* "number" */
 };


@@ -67,9 +69,6 @@ static const UChar ID_DATE[]      = {
 static const UChar ID_TIME[]      = {
     0x74, 0x69, 0x6D, 0x65, 0              /* "time" */
 };
 static const UChar ID_TIME[]      = {
     0x74, 0x69, 0x6D, 0x65, 0              /* "time" */
 };

-static const UChar ID_CHOICE[]    = {
-    0x63, 0x68, 0x6F, 0x69, 0x63, 0x65, 0  /* "choice" */
-};

 static const UChar ID_SPELLOUT[]  = {
     0x73, 0x70, 0x65, 0x6c, 0x6c, 0x6f, 0x75, 0x74, 0 /* "spellout" */
 };
 static const UChar ID_SPELLOUT[]  = {
     0x73, 0x70, 0x65, 0x6c, 0x6c, 0x6f, 0x75, 0x74, 0 /* "spellout" */
 };


@@ -79,28 +78,21 @@ static const UChar ID_ORDINAL[]   = {
 static const UChar ID_DURATION[]  = {
     0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0 /* "duration" */
 };
 static const UChar ID_DURATION[]  = {
     0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0 /* "duration" */
 };

-static const UChar ID_PLURAL[]  = {
-    0x70, 0x6c, 0x75, 0x72, 0x61, 0x6c, 0  /* "plural" */
-};
-static const UChar ID_SELECT[]  = {
-    0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0  /* "select" */
-};

 
 // MessageFormat Type List  Number, Date, Time or Choice
 static const UChar * const TYPE_IDS[] = {
 
 // MessageFormat Type List  Number, Date, Time or Choice
 static const UChar * const TYPE_IDS[] = {

-    ID_EMPTY,

     ID_NUMBER,
     ID_DATE,
     ID_TIME,
     ID_NUMBER,
     ID_DATE,
     ID_TIME,

-    ID_CHOICE,

     ID_SPELLOUT,
     ID_ORDINAL,
     ID_DURATION,
     ID_SPELLOUT,
     ID_ORDINAL,
     ID_DURATION,

-    ID_PLURAL,
-    ID_SELECT,

     NULL,
 };
 
     NULL,
 };
 

+static const UChar ID_EMPTY[]     = {
+    0 /* empty string, used for default so that null can mark end of list */
+};

 static const UChar ID_CURRENCY[]  = {
     0x63, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x63, 0x79, 0  /* "currency" */
 };
 static const UChar ID_CURRENCY[]  = {
     0x63, 0x75, 0x72, 0x72, 0x65, 0x6E, 0x63, 0x79, 0  /* "currency" */
 };


@@ -143,16 +135,32 @@ static const UChar * const DATE_STYLE_IDS[] = {
     NULL,
 };
 
     NULL,
 };
 

-static const U_NAMESPACE_QUALIFIER DateFormat::EStyle DATE_STYLES[] = {
-    U_NAMESPACE_QUALIFIER DateFormat::kDefault,
-    U_NAMESPACE_QUALIFIER DateFormat::kShort,
-    U_NAMESPACE_QUALIFIER DateFormat::kMedium,
-    U_NAMESPACE_QUALIFIER DateFormat::kLong,
-    U_NAMESPACE_QUALIFIER DateFormat::kFull,
+static const icu::DateFormat::EStyle DATE_STYLES[] = {
+    icu::DateFormat::kDefault,
+    icu::DateFormat::kShort,
+    icu::DateFormat::kMedium,
+    icu::DateFormat::kLong,
+    icu::DateFormat::kFull,

 };
 
 static const int32_t DEFAULT_INITIAL_CAPACITY = 10;
 
 };
 
 static const int32_t DEFAULT_INITIAL_CAPACITY = 10;
 

+static const UChar NULL_STRING[] = {
+    0x6E, 0x75, 0x6C, 0x6C, 0  // "null"
+};
+
+static const UChar OTHER_STRING[] = {
+    0x6F, 0x74, 0x68, 0x65, 0x72, 0  // "other"
+};
+
+U_CDECL_BEGIN
+static UBool U_CALLCONV equalFormatsForHash(const UHashTok key1,
+                                            const UHashTok key2) {
+    return icu::MessageFormat::equalFormats(key1.pointer, key2.pointer);
+}
+
+U_CDECL_END
+

 U_NAMESPACE_BEGIN
 
 // -------------------------------------
 U_NAMESPACE_BEGIN
 
 // -------------------------------------


@@ -161,29 +169,6 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(FormatNameEnumeration)
 
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
 

-/**
- * Convert a string to an unsigned decimal, ignoring rule whitespace.
- * @return a non-negative number if successful, or a negative number
- *         upon failure.
- */
-static int32_t stou(const UnicodeString& string) {
-    int32_t n = 0;
-    int32_t count = 0;
-    UChar32 c;
-    for (int32_t i=0; i<string.length(); i+=U16_LENGTH(c)) {
-        c = string.char32At(i);
-        if (uprv_isRuleWhiteSpace(c)) {
-            continue;
-        }
-        int32_t d = u_digit(c, 10);
-        if (d < 0 || ++count > 10) {
-            return -1;
-        }
-        n = 10*n + d;
-    }
-    return n;
-}
-

 /**
  * Convert an integer value to a string and append the result to
  * the given UnicodeString.
 /**
  * Convert an integer value to a string and append the result to
  * the given UnicodeString.


@@ -191,127 +176,98 @@ static int32_t stou(const UnicodeString& string) {
 static UnicodeString& itos(int32_t i, UnicodeString& appendTo) {
     UChar temp[16];
     uprv_itou(temp,16,i,10,0); // 10 == radix
 static UnicodeString& itos(int32_t i, UnicodeString& appendTo) {
     UChar temp[16];
     uprv_itou(temp,16,i,10,0); // 10 == radix

-    appendTo.append(temp);
+    appendTo.append(temp, -1);

     return appendTo;
 }
 
     return appendTo;
 }
 

-/*
- * A structure representing one subformat of this MessageFormat.
- * Each subformat has a Format object, an offset into the plain
- * pattern text fPattern, and an argument number.  The argument
- * number corresponds to the array of arguments to be formatted.
- * @internal
- */
-class MessageFormat::Subformat : public UMemory {
+
+// AppendableWrapper: encapsulates the result of formatting, keeping track
+// of the string and its length.
+class AppendableWrapper : public UMemory {

 public:
 public:

-    /**
-     * @internal
-     */
-    Format* format; // formatter
-    /**
-     * @internal
-     */
-    int32_t offset; // offset into fPattern
-    /**
-     * @internal
-     */
-    // TODO (claireho) or save the number to argName and use itos to convert to number.=> we need this number
-    int32_t argNum;    // 0-based argument number
-    /**
-     * @internal
-     */
-    UnicodeString* argName; // argument name or number
-
-    /**
-     * Clone that.format and assign it to this.format
-     * Do NOT delete this.format
-     * @internal
-     */
-    Subformat& operator=(const Subformat& that) {
-        if (this != &that) {
-            format = that.format ? that.format->clone() : NULL;
-            offset = that.offset;
-            argNum = that.argNum;
-            argName = (that.argNum==-1) ? new UnicodeString(*that.argName): NULL;
+    AppendableWrapper(Appendable& appendable) : app(appendable), len(0) {
+    }
+    void append(const UnicodeString& s) {
+        app.appendString(s.getBuffer(), s.length());
+        len += s.length();
+    }
+    void append(const UChar* s, const int32_t sLength) {
+        app.appendString(s, sLength);
+        len += sLength;
+    }
+    void append(const UnicodeString& s, int32_t start, int32_t length) {
+        append(s.tempSubString(start, length));
+    }
+    void formatAndAppend(const Format* formatter, const Formattable& arg, UErrorCode& ec) {
+        UnicodeString s;
+        formatter->format(arg, s, ec);
+        if (U_SUCCESS(ec)) {
+            append(s);

         }
         }

-        return *this;

     }
     }

-
-    /**
-     * @internal
-     */
-    UBool operator==(const Subformat& that) const {
-        // Do cheap comparisons first
-        return offset == that.offset &&
-               argNum == that.argNum &&
-               ((argName == that.argName) ||
-                (*argName == *that.argName)) &&
-               ((format == that.format) || // handles NULL
-                (*format == *that.format));
+    void formatAndAppend(const Format* formatter, const Formattable& arg,
+                         const UnicodeString &argString, UErrorCode& ec) {
+        if (!argString.isEmpty()) {
+            if (U_SUCCESS(ec)) {
+                append(argString);
+            }
+        } else {
+            formatAndAppend(formatter, arg, ec);
+        }

     }
     }

-
-    /**
-     * @internal
-     */
-    UBool operator!=(const Subformat& that) const {
-        return !operator==(that);
+    int32_t length() {
+        return len;

     }
     }

+private:
+    Appendable& app;
+    int32_t len;

 };
 
 };
 

+

 // -------------------------------------
 // Creates a MessageFormat instance based on the pattern.
 
 MessageFormat::MessageFormat(const UnicodeString& pattern,
                              UErrorCode& success)
 : fLocale(Locale::getDefault()),  // Uses the default locale
 // -------------------------------------
 // Creates a MessageFormat instance based on the pattern.
 
 MessageFormat::MessageFormat(const UnicodeString& pattern,
                              UErrorCode& success)
 : fLocale(Locale::getDefault()),  // Uses the default locale

+  msgPattern(success),

   formatAliases(NULL),
   formatAliasesCapacity(0),
   formatAliases(NULL),
   formatAliasesCapacity(0),

-  idStart(UCHAR_ID_START),
-  idContinue(UCHAR_ID_CONTINUE),
-  subformats(NULL),
-  subformatCount(0),
-  subformatCapacity(0),

   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),
   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),

-  isArgNumeric(TRUE),
+  hasArgTypeConflicts(FALSE),

   defaultNumberFormat(NULL),
   defaultNumberFormat(NULL),

-  defaultDateFormat(NULL)
+  defaultDateFormat(NULL),
+  cachedFormatters(NULL),
+  customFormatArgStarts(NULL),
+  pluralProvider(*this, UPLURAL_TYPE_CARDINAL),
+  ordinalProvider(*this, UPLURAL_TYPE_ORDINAL)

 {
 {

-    if (!allocateSubformats(DEFAULT_INITIAL_CAPACITY) ||
-        !allocateArgTypes(DEFAULT_INITIAL_CAPACITY)) {
-        success = U_MEMORY_ALLOCATION_ERROR;
-        return;
-    }
-    applyPattern(pattern, success);

     setLocaleIDs(fLocale.getName(), fLocale.getName());
     setLocaleIDs(fLocale.getName(), fLocale.getName());

+    applyPattern(pattern, success);

 }
 
 MessageFormat::MessageFormat(const UnicodeString& pattern,
                              const Locale& newLocale,
                              UErrorCode& success)
 : fLocale(newLocale),
 }
 
 MessageFormat::MessageFormat(const UnicodeString& pattern,
                              const Locale& newLocale,
                              UErrorCode& success)
 : fLocale(newLocale),

+  msgPattern(success),

   formatAliases(NULL),
   formatAliasesCapacity(0),
   formatAliases(NULL),
   formatAliasesCapacity(0),

-  idStart(UCHAR_ID_START),
-  idContinue(UCHAR_ID_CONTINUE),
-  subformats(NULL),
-  subformatCount(0),
-  subformatCapacity(0),

   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),
   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),

-  isArgNumeric(TRUE),
+  hasArgTypeConflicts(FALSE),

   defaultNumberFormat(NULL),
   defaultNumberFormat(NULL),

-  defaultDateFormat(NULL)
+  defaultDateFormat(NULL),
+  cachedFormatters(NULL),
+  customFormatArgStarts(NULL),
+  pluralProvider(*this, UPLURAL_TYPE_CARDINAL),
+  ordinalProvider(*this, UPLURAL_TYPE_ORDINAL)

 {
 {

-    if (!allocateSubformats(DEFAULT_INITIAL_CAPACITY) ||
-        !allocateArgTypes(DEFAULT_INITIAL_CAPACITY)) {
-        success = U_MEMORY_ALLOCATION_ERROR;
-        return;
-    }
-    applyPattern(pattern, success);

     setLocaleIDs(fLocale.getName(), fLocale.getName());
     setLocaleIDs(fLocale.getName(), fLocale.getName());

+    applyPattern(pattern, success);

 }
 
 MessageFormat::MessageFormat(const UnicodeString& pattern,
 }
 
 MessageFormat::MessageFormat(const UnicodeString& pattern,


@@ -319,65 +275,57 @@ MessageFormat::MessageFormat(const UnicodeString& pattern,
                              UParseError& parseError,
                              UErrorCode& success)
 : fLocale(newLocale),
                              UParseError& parseError,
                              UErrorCode& success)
 : fLocale(newLocale),

+  msgPattern(success),

   formatAliases(NULL),
   formatAliasesCapacity(0),
   formatAliases(NULL),
   formatAliasesCapacity(0),

-  idStart(UCHAR_ID_START),
-  idContinue(UCHAR_ID_CONTINUE),
-  subformats(NULL),
-  subformatCount(0),
-  subformatCapacity(0),

   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),
   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),

-  isArgNumeric(TRUE),
+  hasArgTypeConflicts(FALSE),

   defaultNumberFormat(NULL),
   defaultNumberFormat(NULL),

-  defaultDateFormat(NULL)
+  defaultDateFormat(NULL),
+  cachedFormatters(NULL),
+  customFormatArgStarts(NULL),
+  pluralProvider(*this, UPLURAL_TYPE_CARDINAL),
+  ordinalProvider(*this, UPLURAL_TYPE_ORDINAL)

 {
 {

-    if (!allocateSubformats(DEFAULT_INITIAL_CAPACITY) ||
-        !allocateArgTypes(DEFAULT_INITIAL_CAPACITY)) {
-        success = U_MEMORY_ALLOCATION_ERROR;
-        return;
-    }
-    applyPattern(pattern, parseError, success);

     setLocaleIDs(fLocale.getName(), fLocale.getName());
     setLocaleIDs(fLocale.getName(), fLocale.getName());

+    applyPattern(pattern, parseError, success);

 }
 
 MessageFormat::MessageFormat(const MessageFormat& that)
 }
 
 MessageFormat::MessageFormat(const MessageFormat& that)

-: Format(that),
+:
+  Format(that),
+  fLocale(that.fLocale),
+  msgPattern(that.msgPattern),

   formatAliases(NULL),
   formatAliasesCapacity(0),
   formatAliases(NULL),
   formatAliasesCapacity(0),

-  idStart(UCHAR_ID_START),
-  idContinue(UCHAR_ID_CONTINUE),
-  subformats(NULL),
-  subformatCount(0),
-  subformatCapacity(0),

   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),
   argTypes(NULL),
   argTypeCount(0),
   argTypeCapacity(0),

-  isArgNumeric(TRUE),
+  hasArgTypeConflicts(that.hasArgTypeConflicts),

   defaultNumberFormat(NULL),
   defaultNumberFormat(NULL),

-  defaultDateFormat(NULL)
+  defaultDateFormat(NULL),
+  cachedFormatters(NULL),
+  customFormatArgStarts(NULL),
+  pluralProvider(*this, UPLURAL_TYPE_CARDINAL),
+  ordinalProvider(*this, UPLURAL_TYPE_ORDINAL)

 {
 {

-    *this = that;
+    // This will take care of creating the hash tables (since they are NULL).
+    UErrorCode ec = U_ZERO_ERROR;
+    copyObjects(that, ec);
+    if (U_FAILURE(ec)) {
+        resetPattern();
+    }

 }
 
 MessageFormat::~MessageFormat()
 {
 }
 
 MessageFormat::~MessageFormat()
 {

-    int32_t idx;
-    for (idx = 0; idx < subformatCount; idx++) {
-        delete subformats[idx].format;
-        delete subformats[idx].argName;
-    }
-    uprv_free(subformats);
-    subformats = NULL;
-    subformatCount = subformatCapacity = 0;
+    uhash_close(cachedFormatters);
+    uhash_close(customFormatArgStarts);

 
     uprv_free(argTypes);
 
     uprv_free(argTypes);

-    argTypes = NULL;
-    argTypeCount = argTypeCapacity = 0;
-

     uprv_free(formatAliases);
     uprv_free(formatAliases);

-

     delete defaultNumberFormat;
     delete defaultDateFormat;
 }
     delete defaultNumberFormat;
     delete defaultDateFormat;
 }


@@ -385,37 +333,6 @@ MessageFormat::~MessageFormat()
 //--------------------------------------------------------------------
 // Variable-size array management
 
 //--------------------------------------------------------------------
 // Variable-size array management
 

-/**
- * Allocate subformats[] to at least the given capacity and return
- * TRUE if successful.  If not, leave subformats[] unchanged.
- *
- * If subformats is NULL, allocate it.  If it is not NULL, enlarge it
- * if necessary to be at least as large as specified.
- */
-UBool MessageFormat::allocateSubformats(int32_t capacity) {
-    if (subformats == NULL) {
-        subformats = (Subformat*) uprv_malloc(sizeof(*subformats) * capacity);
-        subformatCapacity = capacity;
-        subformatCount = 0;
-        if (subformats == NULL) {
-            subformatCapacity = 0;
-            return FALSE;
-        }
-    } else if (subformatCapacity < capacity) {
-        if (capacity < 2*subformatCapacity) {
-            capacity = 2*subformatCapacity;
-        }
-        Subformat* a = (Subformat*)
-            uprv_realloc(subformats, sizeof(*subformats) * capacity);
-        if (a == NULL) {
-            return FALSE; // request failed
-        }
-        subformats = a;
-        subformatCapacity = capacity;
-    }
-    return TRUE;
-}
-

 /**
  * Allocate argTypes[] to at least the given capacity and return
  * TRUE if successful.  If not, leave argTypes[] unchanged.
 /**
  * Allocate argTypes[] to at least the given capacity and return
  * TRUE if successful.  If not, leave argTypes[] unchanged.


@@ -423,33 +340,26 @@ UBool MessageFormat::allocateSubformats(int32_t capacity) {
  * If argTypes is NULL, allocate it.  If it is not NULL, enlarge it
  * if necessary to be at least as large as specified.
  */
  * If argTypes is NULL, allocate it.  If it is not NULL, enlarge it
  * if necessary to be at least as large as specified.
  */

-UBool MessageFormat::allocateArgTypes(int32_t capacity) {
-    if (argTypes == NULL) {
-        argTypes = (Formattable::Type*) uprv_malloc(sizeof(*argTypes) * capacity);
-        argTypeCount = 0;
-        argTypeCapacity = capacity;
-        if (argTypes == NULL) {
-            argTypeCapacity = 0;
-            return FALSE;
-        }
-        for (int32_t i=0; i<capacity; ++i) {
-            argTypes[i] = Formattable::kString;
-        }
-    } else if (argTypeCapacity < capacity) {
-        if (capacity < 2*argTypeCapacity) {
-            capacity = 2*argTypeCapacity;
-        }
-        Formattable::Type* a = (Formattable::Type*)
+UBool MessageFormat::allocateArgTypes(int32_t capacity, UErrorCode& status) {
+    if (U_FAILURE(status)) {
+        return FALSE;
+    }
+    if (argTypeCapacity >= capacity) {
+        return TRUE;
+    }
+    if (capacity < DEFAULT_INITIAL_CAPACITY) {
+        capacity = DEFAULT_INITIAL_CAPACITY;
+    } else if (capacity < 2*argTypeCapacity) {
+        capacity = 2*argTypeCapacity;
+    }
+    Formattable::Type* a = (Formattable::Type*)

             uprv_realloc(argTypes, sizeof(*argTypes) * capacity);
             uprv_realloc(argTypes, sizeof(*argTypes) * capacity);

-        if (a == NULL) {
-            return FALSE; // request failed
-        }
-        for (int32_t i=argTypeCapacity; i<capacity; ++i) {
-            a[i] = Formattable::kString;
-        }
-        argTypes = a;
-        argTypeCapacity = capacity;
+    if (a == NULL) {
+        status = U_MEMORY_ALLOCATION_ERROR;
+        return FALSE;

     }
     }

+    argTypes = a;
+    argTypeCapacity = capacity;

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -459,33 +369,19 @@ UBool MessageFormat::allocateArgTypes(int32_t capacity) {
 const MessageFormat&
 MessageFormat::operator=(const MessageFormat& that)
 {
 const MessageFormat&
 MessageFormat::operator=(const MessageFormat& that)
 {

-    // Reallocate the arrays BEFORE changing this object
-    if (this != &that &&
-        allocateSubformats(that.subformatCount) &&
-        allocateArgTypes(that.argTypeCount)) {
-
+    if (this != &that) {

         // Calls the super class for assignment first.
         Format::operator=(that);
 
         // Calls the super class for assignment first.
         Format::operator=(that);
 

-        fPattern = that.fPattern;

         setLocale(that.fLocale);
         setLocale(that.fLocale);

-        isArgNumeric = that.isArgNumeric;
-        int32_t j;
-        for (j=0; j<subformatCount; ++j) {
-            delete subformats[j].format;
-        }
-        subformatCount = 0;
-
-        for (j=0; j<that.subformatCount; ++j) {
-            // Subformat::operator= does NOT delete this.format
-            subformats[j] = that.subformats[j];
-        }
-        subformatCount = that.subformatCount;
+        msgPattern = that.msgPattern;
+        hasArgTypeConflicts = that.hasArgTypeConflicts;

 
 

-        for (j=0; j<that.argTypeCount; ++j) {
-            argTypes[j] = that.argTypes[j];
+        UErrorCode ec = U_ZERO_ERROR;
+        copyObjects(that, ec);
+        if (U_FAILURE(ec)) {
+            resetPattern();

         }
         }

-        argTypeCount = that.argTypeCount;

     }
     return *this;
 }
     }
     return *this;
 }


@@ -499,19 +395,38 @@ MessageFormat::operator==(const Format& rhs) const
 
     // Check class ID before checking MessageFormat members
     if (!Format::operator==(rhs) ||
 
     // Check class ID before checking MessageFormat members
     if (!Format::operator==(rhs) ||

-        fPattern != that.fPattern ||
-        fLocale != that.fLocale ||
-        isArgNumeric != that.isArgNumeric) {
+        msgPattern != that.msgPattern ||
+        fLocale != that.fLocale) {
+        return FALSE;
+    }
+
+    // Compare hashtables.
+    if ((customFormatArgStarts == NULL) != (that.customFormatArgStarts == NULL)) {

         return FALSE;
     }
         return FALSE;
     }

+    if (customFormatArgStarts == NULL) {
+        return TRUE;
+    }

 
 

-    int32_t j;
-    for (j=0; j<subformatCount; ++j) {
-        if (subformats[j] != that.subformats[j]) {
+    UErrorCode ec = U_ZERO_ERROR;
+    const int32_t count = uhash_count(customFormatArgStarts);
+    const int32_t rhs_count = uhash_count(that.customFormatArgStarts);
+    if (count != rhs_count) {
+        return FALSE;
+    }
+    int32_t idx = 0, rhs_idx = 0, pos = UHASH_FIRST, rhs_pos = UHASH_FIRST;
+    for (; idx < count && rhs_idx < rhs_count && U_SUCCESS(ec); ++idx, ++rhs_idx) {
+        const UHashElement* cur = uhash_nextElement(customFormatArgStarts, &pos);
+        const UHashElement* rhs_cur = uhash_nextElement(that.customFormatArgStarts, &rhs_pos);
+        if (cur->key.integer != rhs_cur->key.integer) {
+            return FALSE;
+        }
+        const Format* format = (const Format*)uhash_iget(cachedFormatters, cur->key.integer);
+        const Format* rhs_format = (const Format*)uhash_iget(that.cachedFormatters, rhs_cur->key.integer);
+        if (*format != *rhs_format) {

             return FALSE;
         }
     }
             return FALSE;
         }
     }

-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -535,9 +450,11 @@ MessageFormat::setLocale(const Locale& theLocale)
         defaultNumberFormat = NULL;
         delete defaultDateFormat;
         defaultDateFormat = NULL;
         defaultNumberFormat = NULL;
         delete defaultDateFormat;
         defaultDateFormat = NULL;

+        fLocale = theLocale;
+        setLocaleIDs(fLocale.getName(), fLocale.getName());
+        pluralProvider.reset();
+        ordinalProvider.reset();

     }
     }

-    fLocale = theLocale;
-    setLocaleIDs(fLocale.getName(), fLocale.getName());

 }
 
 // -------------------------------------
 }
 
 // -------------------------------------


@@ -549,9 +466,6 @@ MessageFormat::getLocale() const
     return fLocale;
 }
 
     return fLocale;
 }
 

-
-
-

 void
 MessageFormat::applyPattern(const UnicodeString& newPattern,
                             UErrorCode& status)
 void
 MessageFormat::applyPattern(const UnicodeString& newPattern,
                             UErrorCode& status)


@@ -572,324 +486,150 @@ MessageFormat::applyPattern(const UnicodeString& pattern,
     if(U_FAILURE(ec)) {
         return;
     }
     if(U_FAILURE(ec)) {
         return;
     }

-    // The pattern is broken up into segments.  Each time a subformat
-    // is encountered, 4 segments are recorded.  For example, consider
-    // the pattern:
-    //  "There {0,choice,0.0#are no files|1.0#is one file|1.0<are {0, number} files} on disk {1}."
-    // The first set of segments is:
-    //  segments[0] = "There "
-    //  segments[1] = "0"
-    //  segments[2] = "choice"
-    //  segments[3] = "0.0#are no files|1.0#is one file|1.0<are {0, number} files"
-
-    // During parsing, the plain text is accumulated into segments[0].
-    // Segments 1..3 are used to parse each subpattern.  Each time a
-    // subpattern is parsed, it creates a format object that is stored
-    // in the subformats array, together with an offset and argument
-    // number.  The offset into the plain text stored in
-    // segments[0].
-
-    // Quotes in segment 0 are handled normally.  They are removed.
-    // Quotes may not occur in segments 1 or 2.
-    // Quotes in segment 3 are parsed and _copied_.  This makes
-    //  subformat patterns work, e.g., {1,number,'#'.##} passes
-    //  the pattern "'#'.##" to DecimalFormat.
-
-    UnicodeString segments[4];
-    int32_t part = 0; // segment we are in, 0..3
-    // Record the highest argument number in the pattern.  (In the
-    // subpattern {3,number} the argument number is 3.)
-    int32_t formatNumber = 0;
-    UBool inQuote = FALSE;
-    int32_t braceStack = 0;
-    // Clear error struct
-    parseError.offset = -1;
-    parseError.preContext[0] = parseError.postContext[0] = (UChar)0;
-    int32_t patLen = pattern.length();
-    int32_t i;
-
-    for (i=0; i<subformatCount; ++i) {
-        delete subformats[i].format;
-    }
-    subformatCount = 0;
-    argTypeCount = 0;
+    msgPattern.parse(pattern, &parseError, ec);
+    cacheExplicitFormats(ec);

 
 

-    for (i=0; i<patLen; ++i) {
-        UChar ch = pattern[i];
-        if (part == 0) {
-            // In segment 0, recognize and remove quotes
-            if (ch == SINGLE_QUOTE) {
-                if (i+1 < patLen && pattern[i+1] == SINGLE_QUOTE) {
-                    segments[0] += ch;
-                    ++i;
-                } else {
-                    inQuote = !inQuote;
-                }
-            } else if (ch == LEFT_CURLY_BRACE && !inQuote) {
-                // The only way we get from segment 0 to 1 is via an
-                // unquoted '{'.
-                part = 1;
-            } else {
-                segments[0] += ch;
-            }
-        } else if (inQuote) {
-            // In segments 1..3, recognize quoted matter, and copy it
-            // into the segment, together with the quotes.  This takes
-            // care of '' as well.
-            segments[part] += ch;
-            if (ch == SINGLE_QUOTE) {
-                inQuote = FALSE;
-            }
-        } else {
-            // We have an unquoted character in segment 1..3
-            switch (ch) {
-            case COMMA:
-                // Commas bump us to the next segment, except for segment 3,
-                // which can contain commas.  See example above.
-                if (part < 3)
-                    part += 1;
-                else
-                    segments[3] += ch;
-                break;
-            case LEFT_CURLY_BRACE:
-                // Handle '{' within segment 3.  The initial '{'
-                // before segment 1 is handled above.
-                if (part != 3) {
-                    ec = U_PATTERN_SYNTAX_ERROR;
-                    goto SYNTAX_ERROR;
-                }
-                ++braceStack;
-                segments[part] += ch;
-                break;
-            case RIGHT_CURLY_BRACE:
-                if (braceStack == 0) {
-                    makeFormat(formatNumber, segments, parseError,ec);
-                    if (U_FAILURE(ec)){
-                        goto SYNTAX_ERROR;
-                    }
-                    formatNumber++;
-
-                    segments[1].remove();
-                    segments[2].remove();
-                    segments[3].remove();
-                    part = 0;
-                } else {
-                    --braceStack;
-                    segments[part] += ch;
-                }
-                break;
-            case SINGLE_QUOTE:
-                inQuote = TRUE;
-                // fall through (copy quote chars in segments 1..3)
-            default:
-                segments[part] += ch;
-                break;
-            }
-        }
-    }
-    if (braceStack != 0 || part != 0) {
-        // Unmatched braces in the pattern
-        ec = U_UNMATCHED_BRACES;
-        goto SYNTAX_ERROR;
+    if (U_FAILURE(ec)) {
+        resetPattern();

     }
     }

-    fPattern = segments[0];
-    return;
+}
+
+void MessageFormat::resetPattern() {
+    msgPattern.clear();
+    uhash_close(cachedFormatters);
+    cachedFormatters = NULL;
+    uhash_close(customFormatArgStarts);
+    customFormatArgStarts = NULL;
+    argTypeCount = 0;
+    hasArgTypeConflicts = FALSE;
+}

 
 

- SYNTAX_ERROR:
-    syntaxError(pattern, i, parseError);
-    for (i=0; i<subformatCount; ++i) {
-        delete subformats[i].format;
+void
+MessageFormat::applyPattern(const UnicodeString& pattern,
+                            UMessagePatternApostropheMode aposMode,
+                            UParseError* parseError,
+                            UErrorCode& status) {
+    if (aposMode != msgPattern.getApostropheMode()) {
+        msgPattern.clearPatternAndSetApostropheMode(aposMode);

     }
     }

-    argTypeCount = subformatCount = 0;
+    applyPattern(pattern, *parseError, status);

 }
 }

+

 // -------------------------------------
 // Converts this MessageFormat instance to a pattern.
 
 UnicodeString&
 MessageFormat::toPattern(UnicodeString& appendTo) const {
 // -------------------------------------
 // Converts this MessageFormat instance to a pattern.
 
 UnicodeString&
 MessageFormat::toPattern(UnicodeString& appendTo) const {

-    // later, make this more extensible
-    int32_t lastOffset = 0;
-    int32_t i;
-    for (i=0; i<subformatCount; ++i) {
-        copyAndFixQuotes(fPattern, lastOffset, subformats[i].offset, appendTo);
-        lastOffset = subformats[i].offset;
-        appendTo += LEFT_CURLY_BRACE;
-        if (isArgNumeric) {
-            itos(subformats[i].argNum, appendTo);
-        }
-        else {
-            appendTo += *subformats[i].argName;
+    if ((customFormatArgStarts != NULL && 0 != uhash_count(customFormatArgStarts)) ||
+        0 == msgPattern.countParts()
+    ) {
+        appendTo.setToBogus();
+        return appendTo;
+    }
+    return appendTo.append(msgPattern.getPatternString());
+}
+
+int32_t MessageFormat::nextTopLevelArgStart(int32_t partIndex) const {
+    if (partIndex != 0) {
+        partIndex = msgPattern.getLimitPartIndex(partIndex);
+    }
+    for (;;) {
+        UMessagePatternPartType type = msgPattern.getPartType(++partIndex);
+        if (type == UMSGPAT_PART_TYPE_ARG_START) {
+            return partIndex;

         }
         }

-        Format* fmt = subformats[i].format;
-        DecimalFormat* decfmt;
-        SimpleDateFormat* sdtfmt;
-        ChoiceFormat* chcfmt;
-        PluralFormat* plfmt;
-        SelectFormat* selfmt;
-        if (fmt == NULL) {
-            // do nothing, string format
+        if (type == UMSGPAT_PART_TYPE_MSG_LIMIT) {
+            return -1;

         }
         }

-        else if ((decfmt = dynamic_cast<DecimalFormat*>(fmt)) != NULL) {
-            UErrorCode ec = U_ZERO_ERROR;
-            NumberFormat& formatAlias = *decfmt;
-            NumberFormat *defaultTemplate = NumberFormat::createInstance(fLocale, ec);
-            NumberFormat *currencyTemplate = NumberFormat::createCurrencyInstance(fLocale, ec);
-            NumberFormat *percentTemplate = NumberFormat::createPercentInstance(fLocale, ec);
-            NumberFormat *integerTemplate = createIntegerFormat(fLocale, ec);
-
-            appendTo += COMMA;
-            appendTo += ID_NUMBER;
-            if (formatAlias != *defaultTemplate) {
-                appendTo += COMMA;
-                if (formatAlias == *currencyTemplate) {
-                    appendTo += ID_CURRENCY;
-                }
-                else if (formatAlias == *percentTemplate) {
-                    appendTo += ID_PERCENT;
-                }
-                else if (formatAlias == *integerTemplate) {
-                    appendTo += ID_INTEGER;
-                }
-                else {
-                    UnicodeString buffer;
-                    appendTo += decfmt->toPattern(buffer);
-                }
-            }
+    }
+}

 
 

-            delete defaultTemplate;
-            delete currencyTemplate;
-            delete percentTemplate;
-            delete integerTemplate;
+void MessageFormat::setArgStartFormat(int32_t argStart,
+                                      Format* formatter,
+                                      UErrorCode& status) {
+    if (U_FAILURE(status)) {
+        delete formatter;
+        return;
+    }
+    if (cachedFormatters == NULL) {
+        cachedFormatters=uhash_open(uhash_hashLong, uhash_compareLong,
+                                    equalFormatsForHash, &status);
+        if (U_FAILURE(status)) {
+            delete formatter;
+            return;

         }
         }

-        else if ((sdtfmt = dynamic_cast<SimpleDateFormat*>(fmt)) != NULL) {
-            DateFormat& formatAlias = *sdtfmt;
-            DateFormat *defaultDateTemplate = DateFormat::createDateInstance(DateFormat::kDefault, fLocale);
-            DateFormat *shortDateTemplate = DateFormat::createDateInstance(DateFormat::kShort, fLocale);
-            DateFormat *longDateTemplate = DateFormat::createDateInstance(DateFormat::kLong, fLocale);
-            DateFormat *fullDateTemplate = DateFormat::createDateInstance(DateFormat::kFull, fLocale);
-            DateFormat *defaultTimeTemplate = DateFormat::createTimeInstance(DateFormat::kDefault, fLocale);
-            DateFormat *shortTimeTemplate = DateFormat::createTimeInstance(DateFormat::kShort, fLocale);
-            DateFormat *longTimeTemplate = DateFormat::createTimeInstance(DateFormat::kLong, fLocale);
-            DateFormat *fullTimeTemplate = DateFormat::createTimeInstance(DateFormat::kFull, fLocale);
-
-
-            appendTo += COMMA;
-            if (formatAlias == *defaultDateTemplate) {
-                appendTo += ID_DATE;
-            }
-            else if (formatAlias == *shortDateTemplate) {
-                appendTo += ID_DATE;
-                appendTo += COMMA;
-                appendTo += ID_SHORT;
-            }
-            else if (formatAlias == *defaultDateTemplate) {
-                appendTo += ID_DATE;
-                appendTo += COMMA;
-                appendTo += ID_MEDIUM;
-            }
-            else if (formatAlias == *longDateTemplate) {
-                appendTo += ID_DATE;
-                appendTo += COMMA;
-                appendTo += ID_LONG;
-            }
-            else if (formatAlias == *fullDateTemplate) {
-                appendTo += ID_DATE;
-                appendTo += COMMA;
-                appendTo += ID_FULL;
-            }
-            else if (formatAlias == *defaultTimeTemplate) {
-                appendTo += ID_TIME;
-            }
-            else if (formatAlias == *shortTimeTemplate) {
-                appendTo += ID_TIME;
-                appendTo += COMMA;
-                appendTo += ID_SHORT;
-            }
-            else if (formatAlias == *defaultTimeTemplate) {
-                appendTo += ID_TIME;
-                appendTo += COMMA;
-                appendTo += ID_MEDIUM;
-            }
-            else if (formatAlias == *longTimeTemplate) {
-                appendTo += ID_TIME;
-                appendTo += COMMA;
-                appendTo += ID_LONG;
-            }
-            else if (formatAlias == *fullTimeTemplate) {
-                appendTo += ID_TIME;
-                appendTo += COMMA;
-                appendTo += ID_FULL;
-            }
-            else {
-                UnicodeString buffer;
-                appendTo += ID_DATE;
-                appendTo += COMMA;
-                appendTo += sdtfmt->toPattern(buffer);
-            }
+        uhash_setValueDeleter(cachedFormatters, uprv_deleteUObject);
+    }
+    if (formatter == NULL) {
+        formatter = new DummyFormat();
+    }
+    uhash_iput(cachedFormatters, argStart, formatter, &status);
+}

 
 

-            delete defaultDateTemplate;
-            delete shortDateTemplate;
-            delete longDateTemplate;
-            delete fullDateTemplate;
-            delete defaultTimeTemplate;
-            delete shortTimeTemplate;
-            delete longTimeTemplate;
-            delete fullTimeTemplate;
-            // {sfb} there should be a more efficient way to do this!
-        }
-        else if ((chcfmt = dynamic_cast<ChoiceFormat*>(fmt)) != NULL) {
-            UnicodeString buffer;
-            appendTo += COMMA;
-            appendTo += ID_CHOICE;
-            appendTo += COMMA;
-            appendTo += ((ChoiceFormat*)fmt)->toPattern(buffer);
-        }
-        else if ((plfmt = dynamic_cast<PluralFormat*>(fmt)) != NULL) {
-            UnicodeString buffer;
-            appendTo += plfmt->toPattern(buffer);
-        }
-        else if ((selfmt = dynamic_cast<SelectFormat*>(fmt)) != NULL) {
-            UnicodeString buffer;
-            appendTo += ((SelectFormat*)fmt)->toPattern(buffer);
-        }
-        else {
-            //appendTo += ", unknown";
-        }
-        appendTo += RIGHT_CURLY_BRACE;
+
+UBool MessageFormat::argNameMatches(int32_t partIndex, const UnicodeString& argName, int32_t argNumber) {
+    const MessagePattern::Part& part = msgPattern.getPart(partIndex);
+    return part.getType() == UMSGPAT_PART_TYPE_ARG_NAME ?
+        msgPattern.partSubstringMatches(part, argName) :
+        part.getValue() == argNumber;  // ARG_NUMBER
+}
+
+// Sets a custom formatter for a MessagePattern ARG_START part index.
+// "Custom" formatters are provided by the user via setFormat() or similar APIs.
+void MessageFormat::setCustomArgStartFormat(int32_t argStart,
+                                            Format* formatter,
+                                            UErrorCode& status) {
+    setArgStartFormat(argStart, formatter, status);
+    if (customFormatArgStarts == NULL) {
+        customFormatArgStarts=uhash_open(uhash_hashLong, uhash_compareLong,
+                                         NULL, &status);
+    }
+    uhash_iputi(customFormatArgStarts, argStart, 1, &status);
+}
+
+Format* MessageFormat::getCachedFormatter(int32_t argumentNumber) const {
+    if (cachedFormatters == NULL) {
+        return NULL;
+    }
+    void* ptr = uhash_iget(cachedFormatters, argumentNumber);
+    if (ptr != NULL && dynamic_cast<DummyFormat*>((Format*)ptr) == NULL) {
+        return (Format*) ptr;
+    } else {
+        // Not cached, or a DummyFormat representing setFormat(NULL).
+        return NULL;

     }
     }

-    copyAndFixQuotes(fPattern, lastOffset, fPattern.length(), appendTo);
-    return appendTo;

 }
 
 // -------------------------------------
 // Adopts the new formats array and updates the array count.
 // This MessageFormat instance owns the new formats.
 }
 
 // -------------------------------------
 // Adopts the new formats array and updates the array count.
 // This MessageFormat instance owns the new formats.

-

 void
 MessageFormat::adoptFormats(Format** newFormats,
                             int32_t count) {
     if (newFormats == NULL || count < 0) {
         return;
     }
 void
 MessageFormat::adoptFormats(Format** newFormats,
                             int32_t count) {
     if (newFormats == NULL || count < 0) {
         return;
     }

+    // Throw away any cached formatters.
+    if (cachedFormatters != NULL) {
+        uhash_removeAll(cachedFormatters);
+    }
+    if (customFormatArgStarts != NULL) {
+        uhash_removeAll(customFormatArgStarts);
+    }

 
 

-    int32_t i;
-    if (allocateSubformats(count)) {
-        for (i=0; i<subformatCount; ++i) {
-            delete subformats[i].format;
-        }
-        for (i=0; i<count; ++i) {
-            subformats[i].format = newFormats[i];
-        }
-        subformatCount = count;
-    } else {
-        // An adopt method must always take ownership.  Delete
-        // the incoming format objects and return unchanged.
-        for (i=0; i<count; ++i) {
-            delete newFormats[i];
-        }
+    int32_t formatNumber = 0;
+    UErrorCode status = U_ZERO_ERROR;
+    for (int32_t partIndex = 0;
+        formatNumber < count && U_SUCCESS(status) &&
+            (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+        setCustomArgStartFormat(partIndex, newFormats[formatNumber], status);
+        ++formatNumber;
+    }
+    // Delete those that didn't get used (if any).
+    for (; formatNumber < count; ++formatNumber) {
+        delete newFormats[formatNumber];

     }
 
     }
 

-    // TODO: What about the .offset and .argNum fields?

 }
 
 // -------------------------------------
 }
 
 // -------------------------------------


@@ -902,21 +642,31 @@ MessageFormat::setFormats(const Format** newFormats,
     if (newFormats == NULL || count < 0) {
         return;
     }
     if (newFormats == NULL || count < 0) {
         return;
     }

-
-    if (allocateSubformats(count)) {
-        int32_t i;
-        for (i=0; i<subformatCount; ++i) {
-            delete subformats[i].format;
-        }
-        subformatCount = 0;
-
-        for (i=0; i<count; ++i) {
-            subformats[i].format = newFormats[i] ? newFormats[i]->clone() : NULL;
-        }
-        subformatCount = count;
+    // Throw away any cached formatters.
+    if (cachedFormatters != NULL) {
+        uhash_removeAll(cachedFormatters);
+    }
+    if (customFormatArgStarts != NULL) {
+        uhash_removeAll(customFormatArgStarts);

     }
 
     }
 

-    // TODO: What about the .offset and .arg fields?
+    UErrorCode status = U_ZERO_ERROR;
+    int32_t formatNumber = 0;
+    for (int32_t partIndex = 0;
+        formatNumber < count && U_SUCCESS(status) && (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+      Format* newFormat = NULL;
+      if (newFormats[formatNumber] != NULL) {
+          newFormat = newFormats[formatNumber]->clone();
+          if (newFormat == NULL) {
+              status = U_MEMORY_ALLOCATION_ERROR;
+          }
+      }
+      setCustomArgStartFormat(partIndex, newFormat, status);
+      ++formatNumber;
+    }
+    if (U_FAILURE(status)) {
+        resetPattern();
+    }

 }
 
 // -------------------------------------
 }
 
 // -------------------------------------


@@ -925,11 +675,17 @@ MessageFormat::setFormats(const Format** newFormats,
 
 void
 MessageFormat::adoptFormat(int32_t n, Format *newFormat) {
 
 void
 MessageFormat::adoptFormat(int32_t n, Format *newFormat) {

-    if (n < 0 || n >= subformatCount) {
-        delete newFormat;
-    } else {
-        delete subformats[n].format;
-        subformats[n].format = newFormat;
+    LocalPointer<Format> p(newFormat);
+    if (n >= 0) {
+        int32_t formatNumber = 0;
+        for (int32_t partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+            if (n == formatNumber) {
+                UErrorCode status = U_ZERO_ERROR;
+                setCustomArgStartFormat(partIndex, p.orphan(), status);
+                return;
+            }
+            ++formatNumber;
+        }

     }
 }
 
     }
 }
 


@@ -940,24 +696,32 @@ void
 MessageFormat::adoptFormat(const UnicodeString& formatName,
                            Format* formatToAdopt,
                            UErrorCode& status) {
 MessageFormat::adoptFormat(const UnicodeString& formatName,
                            Format* formatToAdopt,
                            UErrorCode& status) {

-    if (isArgNumeric ) {
-        int32_t argumentNumber = stou(formatName);
-        if (argumentNumber<0) {
-            status = U_ARGUMENT_TYPE_MISMATCH;
-            return;
-        }
-        adoptFormat(argumentNumber, formatToAdopt);
+    LocalPointer<Format> p(formatToAdopt);
+    if (U_FAILURE(status)) {
+        return;
+    }
+    int32_t argNumber = MessagePattern::validateArgumentName(formatName);
+    if (argNumber < UMSGPAT_ARG_NAME_NOT_NUMBER) {
+        status = U_ILLEGAL_ARGUMENT_ERROR;

         return;
     }
         return;
     }

-    for (int32_t i=0; i<subformatCount; ++i) {
-        if (formatName==*subformats[i].argName) {
-            delete subformats[i].format;
-            if ( formatToAdopt== NULL) {
-                // This should never happen -- but we'll be nice if it does
-                subformats[i].format = NULL;
+    for (int32_t partIndex = 0;
+        (partIndex = nextTopLevelArgStart(partIndex)) >= 0 && U_SUCCESS(status);
+    ) {
+        if (argNameMatches(partIndex + 1, formatName, argNumber)) {
+            Format* f;
+            if (p.isValid()) {
+                f = p.orphan();
+            } else if (formatToAdopt == NULL) {
+                f = NULL;

             } else {
             } else {

-                subformats[i].format = formatToAdopt;
+                f = formatToAdopt->clone();
+                if (f == NULL) {
+                    status = U_MEMORY_ALLOCATION_ERROR;
+                    return;
+                }

             }
             }

+            setCustomArgStartFormat(partIndex, f, status);

         }
     }
 }
         }
     }
 }


@@ -965,16 +729,22 @@ MessageFormat::adoptFormat(const UnicodeString& formatName,
 // -------------------------------------
 // Set a single format.
 // Do nothing if the variable is not less than the array count.
 // -------------------------------------
 // Set a single format.
 // Do nothing if the variable is not less than the array count.

-

 void
 MessageFormat::setFormat(int32_t n, const Format& newFormat) {
 void
 MessageFormat::setFormat(int32_t n, const Format& newFormat) {

-    if (n >= 0 && n < subformatCount) {
-        delete subformats[n].format;
-        if (&newFormat == NULL) {
-            // This should never happen -- but we'll be nice if it does
-            subformats[n].format = NULL;
-        } else {
-            subformats[n].format = newFormat.clone();
+
+    if (n >= 0) {
+        int32_t formatNumber = 0;
+        for (int32_t partIndex = 0;
+             (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+            if (n == formatNumber) {
+                Format* new_format = newFormat.clone();
+                if (new_format) {
+                    UErrorCode status = U_ZERO_ERROR;
+                    setCustomArgStartFormat(partIndex, new_format, status);
+                }
+                return;
+            }
+            ++formatNumber;

         }
     }
 }
         }
     }
 }


@@ -984,27 +754,16 @@ MessageFormat::setFormat(int32_t n, const Format& newFormat) {
 // Do nothing if the variable is not less than the array count.
 Format *
 MessageFormat::getFormat(const UnicodeString& formatName, UErrorCode& status) {
 // Do nothing if the variable is not less than the array count.
 Format *
 MessageFormat::getFormat(const UnicodeString& formatName, UErrorCode& status) {

+    if (U_FAILURE(status) || cachedFormatters == NULL) return NULL;

 
 

-    if (U_FAILURE(status)) return NULL;
-
-    if (isArgNumeric ) {
-        int32_t argumentNumber = stou(formatName);
-        if (argumentNumber<0) {
-            status = U_ARGUMENT_TYPE_MISMATCH;
-            return NULL;
-        }
-        if (argumentNumber < 0 || argumentNumber >= subformatCount) {
-            return subformats[argumentNumber].format;
-        }
-        else {
-            return NULL;
-        }
+    int32_t argNumber = MessagePattern::validateArgumentName(formatName);
+    if (argNumber < UMSGPAT_ARG_NAME_NOT_NUMBER) {
+        status = U_ILLEGAL_ARGUMENT_ERROR;
+        return NULL;

     }
     }

-
-    for (int32_t i=0; i<subformatCount; ++i) {
-        if (formatName==*subformats[i].argName)
-        {
-            return subformats[i].format;
+    for (int32_t partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+        if (argNameMatches(partIndex + 1, formatName, argNumber)) {
+            return getCachedFormatter(partIndex);

         }
     }
     return NULL;
         }
     }
     return NULL;


@@ -1017,28 +776,29 @@ void
 MessageFormat::setFormat(const UnicodeString& formatName,
                          const Format& newFormat,
                          UErrorCode& status) {
 MessageFormat::setFormat(const UnicodeString& formatName,
                          const Format& newFormat,
                          UErrorCode& status) {

-    if (isArgNumeric) {
-        status = U_ARGUMENT_TYPE_MISMATCH;
+    if (U_FAILURE(status)) return;
+
+    int32_t argNumber = MessagePattern::validateArgumentName(formatName);
+    if (argNumber < UMSGPAT_ARG_NAME_NOT_NUMBER) {
+        status = U_ILLEGAL_ARGUMENT_ERROR;

         return;
     }
         return;
     }

-    for (int32_t i=0; i<subformatCount; ++i) {
-        if (formatName==*subformats[i].argName)
-        {
-            delete subformats[i].format;
-            if (&newFormat == NULL) {
-                // This should never happen -- but we'll be nice if it does
-                subformats[i].format = NULL;
-            } else {
-                subformats[i].format = newFormat.clone();
+    for (int32_t partIndex = 0;
+        (partIndex = nextTopLevelArgStart(partIndex)) >= 0 && U_SUCCESS(status);
+    ) {
+        if (argNameMatches(partIndex + 1, formatName, argNumber)) {
+            Format* new_format = newFormat.clone();
+            if (new_format == NULL) {
+                status = U_MEMORY_ALLOCATION_ERROR;
+                return;

             }
             }

-            break;
+            setCustomArgStartFormat(partIndex, new_format, status);

         }
     }
 }
 
 // -------------------------------------
 // Gets the format array.
         }
     }
 }
 
 // -------------------------------------
 // Gets the format array.

-

 const Format**
 MessageFormat::getFormats(int32_t& cnt) const
 {
 const Format**
 MessageFormat::getFormats(int32_t& cnt) const
 {


@@ -1047,48 +807,54 @@ MessageFormat::getFormats(int32_t& cnt) const
     // method on this object.  We construct and resize an array
     // on demand that contains aliases to the subformats[i].format
     // pointers.
     // method on this object.  We construct and resize an array
     // on demand that contains aliases to the subformats[i].format
     // pointers.

-    MessageFormat* t = (MessageFormat*) this;
+    MessageFormat* t = const_cast<MessageFormat*> (this);

     cnt = 0;
     if (formatAliases == NULL) {
     cnt = 0;
     if (formatAliases == NULL) {

-        t->formatAliasesCapacity = (subformatCount<10) ? 10 : subformatCount;
+        t->formatAliasesCapacity = (argTypeCount<10) ? 10 : argTypeCount;

         Format** a = (Format**)
             uprv_malloc(sizeof(Format*) * formatAliasesCapacity);
         if (a == NULL) {
         Format** a = (Format**)
             uprv_malloc(sizeof(Format*) * formatAliasesCapacity);
         if (a == NULL) {

+            t->formatAliasesCapacity = 0;

             return NULL;
         }
         t->formatAliases = a;
             return NULL;
         }
         t->formatAliases = a;

-    } else if (subformatCount > formatAliasesCapacity) {
+    } else if (argTypeCount > formatAliasesCapacity) {

         Format** a = (Format**)
         Format** a = (Format**)

-            uprv_realloc(formatAliases, sizeof(Format*) * subformatCount);
+            uprv_realloc(formatAliases, sizeof(Format*) * argTypeCount);

         if (a == NULL) {
         if (a == NULL) {

+            t->formatAliasesCapacity = 0;

             return NULL;
         }
         t->formatAliases = a;
             return NULL;
         }
         t->formatAliases = a;

-        t->formatAliasesCapacity = subformatCount;
+        t->formatAliasesCapacity = argTypeCount;

     }
     }

-    for (int32_t i=0; i<subformatCount; ++i) {
-        t->formatAliases[i] = subformats[i].format;
+
+    for (int32_t partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+        t->formatAliases[cnt++] = getCachedFormatter(partIndex);

     }
     }

-    cnt = subformatCount;
+

     return (const Format**)formatAliases;
 }
 
 
     return (const Format**)formatAliases;
 }
 
 

+UnicodeString MessageFormat::getArgName(int32_t partIndex) {
+    const MessagePattern::Part& part = msgPattern.getPart(partIndex);
+    return msgPattern.getSubstring(part);
+}
+

 StringEnumeration*
 MessageFormat::getFormatNames(UErrorCode& status) {
     if (U_FAILURE(status))  return NULL;
 
 StringEnumeration*
 MessageFormat::getFormatNames(UErrorCode& status) {
     if (U_FAILURE(status))  return NULL;
 

-    if (isArgNumeric) {
-        status = U_ARGUMENT_TYPE_MISMATCH;
-        return NULL;
-    }

     UVector *fFormatNames = new UVector(status);
     if (U_FAILURE(status)) {
         status = U_MEMORY_ALLOCATION_ERROR;
         return NULL;
     }
     UVector *fFormatNames = new UVector(status);
     if (U_FAILURE(status)) {
         status = U_MEMORY_ALLOCATION_ERROR;
         return NULL;
     }

-    for (int32_t i=0; i<subformatCount; ++i) {
-        fFormatNames->addElement(new UnicodeString(*subformats[i].argName), status);
+    fFormatNames->setDeleter(uprv_deleteUObject);
+
+    for (int32_t partIndex = 0; (partIndex = nextTopLevelArgStart(partIndex)) >= 0;) {
+        fFormatNames->addElement(new UnicodeString(getArgName(partIndex + 1)), status);

     }
 
     StringEnumeration* nameEnumerator = new FormatNameEnumeration(fFormatNames, status);
     }
 
     StringEnumeration* nameEnumerator = new FormatNameEnumeration(fFormatNames, status);


@@ -1106,10 +872,7 @@ MessageFormat::format(const Formattable* source,
                       FieldPosition& ignore,
                       UErrorCode& success) const
 {
                       FieldPosition& ignore,
                       UErrorCode& success) const
 {

-    if (U_FAILURE(success))
-        return appendTo;
-
-    return format(source, cnt, appendTo, ignore, 0, success);
+    return format(source, NULL, cnt, appendTo, &ignore, success);

 }
 
 // -------------------------------------
 }
 
 // -------------------------------------


@@ -1125,9 +888,7 @@ MessageFormat::format(  const UnicodeString& pattern,
                         UErrorCode& success)
 {
     MessageFormat temp(pattern, success);
                         UErrorCode& success)
 {
     MessageFormat temp(pattern, success);

-    FieldPosition ignore(0);
-    temp.format(arguments, cnt, appendTo, ignore, success);
-    return appendTo;
+    return temp.format(arguments, NULL, cnt, appendTo, NULL, success);

 }
 
 // -------------------------------------
 }
 
 // -------------------------------------


@@ -1141,279 +902,601 @@ MessageFormat::format(const Formattable& source,
                       FieldPosition& ignore,
                       UErrorCode& success) const
 {
                       FieldPosition& ignore,
                       UErrorCode& success) const
 {

-    int32_t cnt;
-

     if (U_FAILURE(success))
         return appendTo;
     if (source.getType() != Formattable::kArray) {
         success = U_ILLEGAL_ARGUMENT_ERROR;
         return appendTo;
     }
     if (U_FAILURE(success))
         return appendTo;
     if (source.getType() != Formattable::kArray) {
         success = U_ILLEGAL_ARGUMENT_ERROR;
         return appendTo;
     }

+    int32_t cnt;

     const Formattable* tmpPtr = source.getArray(cnt);
     const Formattable* tmpPtr = source.getArray(cnt);

-
-    return format(tmpPtr, cnt, appendTo, ignore, 0, success);
+    return format(tmpPtr, NULL, cnt, appendTo, &ignore, success);

 }
 
 }
 

-

 UnicodeString&
 MessageFormat::format(const UnicodeString* argumentNames,
                       const Formattable* arguments,
                       int32_t count,
                       UnicodeString& appendTo,
                       UErrorCode& success) const {
 UnicodeString&
 MessageFormat::format(const UnicodeString* argumentNames,
                       const Formattable* arguments,
                       int32_t count,
                       UnicodeString& appendTo,
                       UErrorCode& success) const {

-    FieldPosition ignore(0);
-    return format(arguments, argumentNames, count, appendTo, ignore, 0, success);
+    return format(arguments, argumentNames, count, appendTo, NULL, success);
+}
+
+// Does linear search to find the match for an ArgName.
+const Formattable* MessageFormat::getArgFromListByName(const Formattable* arguments,
+                                                       const UnicodeString *argumentNames,
+                                                       int32_t cnt, UnicodeString& name) const {
+    for (int32_t i = 0; i < cnt; ++i) {
+        if (0 == argumentNames[i].compare(name)) {
+            return arguments + i;
+        }
+    }
+    return NULL;

 }
 
 }
 

+

 UnicodeString&
 MessageFormat::format(const Formattable* arguments,
 UnicodeString&
 MessageFormat::format(const Formattable* arguments,

+                      const UnicodeString *argumentNames,

                       int32_t cnt,
                       UnicodeString& appendTo,
                       int32_t cnt,
                       UnicodeString& appendTo,

-                      FieldPosition& status,
-                      int32_t recursionProtection,
-                      UErrorCode& success) const
-{
-    return format(arguments, NULL, cnt, appendTo, status, recursionProtection, success);
+                      FieldPosition* pos,
+                      UErrorCode& status) const {
+    if (U_FAILURE(status)) {
+        return appendTo;
+    }
+
+    UnicodeStringAppendable usapp(appendTo);
+    AppendableWrapper app(usapp);
+    format(0, NULL, arguments, argumentNames, cnt, app, pos, status);
+    return appendTo;

 }
 
 }
 

-// -------------------------------------
-// Formats the arguments Formattable array and copy into the appendTo buffer.
-// Ignore the FieldPosition result for error checking.
+namespace {

 
 

-UnicodeString&
-MessageFormat::format(const Formattable* arguments,
-                      const UnicodeString *argumentNames,
-                      int32_t cnt,
-                      UnicodeString& appendTo,
-                      FieldPosition& status,
-                      int32_t recursionProtection,
-                      UErrorCode& success) const
-{
-    int32_t lastOffset = 0;
-    int32_t argumentNumber=0;
-    if (cnt < 0 || (cnt && arguments == NULL)) {
-        success = U_ILLEGAL_ARGUMENT_ERROR;
-        return appendTo;
-    }
+/**
+ * Mutable input/output values for the PluralSelectorProvider.
+ * Separate so that it is possible to make MessageFormat Freezable.
+ */
+class PluralSelectorContext {
+public:
+    PluralSelectorContext(int32_t start, const UnicodeString &name,
+                          const Formattable &num, double off, UErrorCode &errorCode)
+            : startIndex(start), argName(name), offset(off),
+              numberArgIndex(-1), formatter(NULL), forReplaceNumber(FALSE) {
+        // number needs to be set even when select() is not called.
+        // Keep it as a Number/Formattable:
+        // For format() methods, and to preserve information (e.g., BigDecimal).
+        if(off == 0) {
+            number = num;
+        } else {
+            number = num.getDouble(errorCode) - off;
+        }
+    }
+
+    // Input values for plural selection with decimals.
+    int32_t startIndex;
+    const UnicodeString &argName;
+    /** argument number - plural offset */
+    Formattable number;
+    double offset;
+    // Output values for plural selection with decimals.
+    /** -1 if REPLACE_NUMBER, 0 arg not found, >0 ARG_START index */
+    int32_t numberArgIndex;
+    const Format *formatter;
+    /** formatted argument number - plural offset */
+    UnicodeString numberString;
+    /** TRUE if number-offset was formatted with the stock number formatter */
+    UBool forReplaceNumber;
+};

 
 

-    if ( !isArgNumeric && argumentNames== NULL ) {
-        success = U_ILLEGAL_ARGUMENT_ERROR;
-        return appendTo;
+}  // namespace
+
+// if argumentNames is NULL, this means arguments is a numeric array.
+// arguments can not be NULL.
+// We use const void *plNumber rather than const PluralSelectorContext *pluralNumber
+// so that we need not declare the PluralSelectorContext in the public header file.
+void MessageFormat::format(int32_t msgStart, const void *plNumber,
+                           const Formattable* arguments,
+                           const UnicodeString *argumentNames,
+                           int32_t cnt,
+                           AppendableWrapper& appendTo,
+                           FieldPosition* ignore,
+                           UErrorCode& success) const {
+    if (U_FAILURE(success)) {
+        return;

     }
 
     }
 

-    const Formattable *obj=NULL;
-    for (int32_t i=0; i<subformatCount; ++i) {
-        // Append the prefix of current format element.
-        appendTo.append(fPattern, lastOffset, subformats[i].offset - lastOffset);
-        lastOffset = subformats[i].offset;
-        obj = NULL;
-        if (isArgNumeric) {
-            argumentNumber = subformats[i].argNum;
-
-            // Checks the scope of the argument number.
-            if (argumentNumber >= cnt) {
-                appendTo += LEFT_CURLY_BRACE;
-                itos(argumentNumber, appendTo);
-                appendTo += RIGHT_CURLY_BRACE;
-                continue;
+    const UnicodeString& msgString = msgPattern.getPatternString();
+    int32_t prevIndex = msgPattern.getPart(msgStart).getLimit();
+    for (int32_t i = msgStart + 1; U_SUCCESS(success) ; ++i) {
+        const MessagePattern::Part* part = &msgPattern.getPart(i);
+        const UMessagePatternPartType type = part->getType();
+        int32_t index = part->getIndex();
+        appendTo.append(msgString, prevIndex, index - prevIndex);
+        if (type == UMSGPAT_PART_TYPE_MSG_LIMIT) {
+            return;
+        }
+        prevIndex = part->getLimit();
+        if (type == UMSGPAT_PART_TYPE_REPLACE_NUMBER) {
+            const PluralSelectorContext &pluralNumber =
+                *static_cast<const PluralSelectorContext *>(plNumber);
+            if(pluralNumber.forReplaceNumber) {
+                // number-offset was already formatted.
+                appendTo.formatAndAppend(pluralNumber.formatter,
+                        pluralNumber.number, pluralNumber.numberString, success);
+            } else {
+                const NumberFormat* nf = getDefaultNumberFormat(success);
+                appendTo.formatAndAppend(nf, pluralNumber.number, success);

             }
             }

-            obj = arguments+argumentNumber;
+            continue;

         }
         }

-        else {
-            for (int32_t j=0; j<cnt; ++j) {
-                if (argumentNames[j]== *subformats[i].argName ) {
-                    obj = arguments+j;
-                    break;
-                }
+        if (type != UMSGPAT_PART_TYPE_ARG_START) {
+            continue;
+        }
+        int32_t argLimit = msgPattern.getLimitPartIndex(i);
+        UMessagePatternArgType argType = part->getArgType();
+        part = &msgPattern.getPart(++i);
+        const Formattable* arg;
+        UBool noArg = FALSE;
+        UnicodeString argName = msgPattern.getSubstring(*part);
+        if (argumentNames == NULL) {
+            int32_t argNumber = part->getValue();  // ARG_NUMBER
+            if (0 <= argNumber && argNumber < cnt) {
+                arg = arguments + argNumber;
+            } else {
+                arg = NULL;
+                noArg = TRUE;

             }
             }

-            if (obj == NULL ) {
-                appendTo += LEFT_CURLY_BRACE;
-                appendTo += *subformats[i].argName;
-                appendTo += RIGHT_CURLY_BRACE;
-                continue;
-
+        } else {
+            arg = getArgFromListByName(arguments, argumentNames, cnt, argName);
+            if (arg == NULL) {
+                noArg = TRUE;

             }
         }
             }
         }

-        Formattable::Type type = obj->getType();
-
-        // Recursively calling the format process only if the current
-        // format argument refers to either of the following:
-        // a ChoiceFormat object, a PluralFormat object, a SelectFormat object.
-        Format* fmt = subformats[i].format;
-        if (fmt != NULL) {
-            UnicodeString argNum;
-            fmt->format(*obj, argNum, success);
-
-            // Needs to reprocess the ChoiceFormat and PluralFormat and SelectFormat option by using the
-            // MessageFormat pattern application.
-            if ((dynamic_cast<ChoiceFormat*>(fmt) != NULL ||
-                 dynamic_cast<PluralFormat*>(fmt) != NULL ||
-                 dynamic_cast<SelectFormat*>(fmt) != NULL) &&
-                argNum.indexOf(LEFT_CURLY_BRACE) >= 0
-            ) {
-                MessageFormat temp(argNum, fLocale, success);
-                // TODO: Implement recursion protection
-                if ( isArgNumeric ) {
-                    temp.format(arguments, NULL, cnt, appendTo, status, recursionProtection, success);
-                }
-                else {
-                    temp.format(arguments, argumentNames, cnt, appendTo, status, recursionProtection, success);
-                }
-                if (U_FAILURE(success)) {
-                    return appendTo;
+        ++i;
+        int32_t prevDestLength = appendTo.length();
+        const Format* formatter = NULL;
+        if (noArg) {
+            appendTo.append(
+                UnicodeString(LEFT_CURLY_BRACE).append(argName).append(RIGHT_CURLY_BRACE));
+        } else if (arg == NULL) {
+            appendTo.append(NULL_STRING, 4);
+        } else if(plNumber!=NULL &&
+                static_cast<const PluralSelectorContext *>(plNumber)->numberArgIndex==(i-2)) {
+            const PluralSelectorContext &pluralNumber =
+                *static_cast<const PluralSelectorContext *>(plNumber);
+            if(pluralNumber.offset == 0) {
+                // The number was already formatted with this formatter.
+                appendTo.formatAndAppend(pluralNumber.formatter, pluralNumber.number,
+                                         pluralNumber.numberString, success);
+            } else {
+                // Do not use the formatted (number-offset) string for a named argument
+                // that formats the number without subtracting the offset.
+                appendTo.formatAndAppend(pluralNumber.formatter, *arg, success);
+            }
+        } else if ((formatter = getCachedFormatter(i -2))) {
+            // Handles all ArgType.SIMPLE, and formatters from setFormat() and its siblings.
+            if (dynamic_cast<const ChoiceFormat*>(formatter) ||
+                dynamic_cast<const PluralFormat*>(formatter) ||
+                dynamic_cast<const SelectFormat*>(formatter)) {
+                // We only handle nested formats here if they were provided via
+                // setFormat() or its siblings. Otherwise they are not cached and instead
+                // handled below according to argType.
+                UnicodeString subMsgString;
+                formatter->format(*arg, subMsgString, success);
+                if (subMsgString.indexOf(LEFT_CURLY_BRACE) >= 0 ||
+                    (subMsgString.indexOf(SINGLE_QUOTE) >= 0 && !MessageImpl::jdkAposMode(msgPattern))
+                ) {
+                    MessageFormat subMsgFormat(subMsgString, fLocale, success);
+                    subMsgFormat.format(0, NULL, arguments, argumentNames, cnt, appendTo, ignore, success);
+                } else {
+                    appendTo.append(subMsgString);

                 }
                 }

+            } else {
+                appendTo.formatAndAppend(formatter, *arg, success);

             }
             }

-            else {
-                appendTo += argNum;
+        } else if (argType == UMSGPAT_ARG_TYPE_NONE || (cachedFormatters && uhash_iget(cachedFormatters, i - 2))) {
+            // We arrive here if getCachedFormatter returned NULL, but there was actually an element in the hash table.
+            // This can only happen if the hash table contained a DummyFormat, so the if statement above is a check
+            // for the hash table containind DummyFormat.
+            if (arg->isNumeric()) {
+                const NumberFormat* nf = getDefaultNumberFormat(success);
+                appendTo.formatAndAppend(nf, *arg, success);
+            } else if (arg->getType() == Formattable::kDate) {
+                const DateFormat* df = getDefaultDateFormat(success);
+                appendTo.formatAndAppend(df, *arg, success);
+            } else {
+                appendTo.append(arg->getString(success));

             }
             }

-        }
-        // If the obj data type is a number, use a NumberFormat instance.
-        else if ((type == Formattable::kDouble) ||
-                 (type == Formattable::kLong) ||
-                 (type == Formattable::kInt64)) {
-
-            const NumberFormat* nf = getDefaultNumberFormat(success);
-            if (nf == NULL) {
-                return appendTo;
+        } else if (argType == UMSGPAT_ARG_TYPE_CHOICE) {
+            if (!arg->isNumeric()) {
+                success = U_ILLEGAL_ARGUMENT_ERROR;
+                return;

             }
             }

-            if (type == Formattable::kDouble) {
-                nf->format(obj->getDouble(), appendTo);
-            } else if (type == Formattable::kLong) {
-                nf->format(obj->getLong(), appendTo);
-            } else {
-                nf->format(obj->getInt64(), appendTo);
+            // We must use the Formattable::getDouble() variant with the UErrorCode parameter
+            // because only this one converts non-double numeric types to double.
+            const double number = arg->getDouble(success);
+            int32_t subMsgStart = ChoiceFormat::findSubMessage(msgPattern, i, number);
+            formatComplexSubMessage(subMsgStart, NULL, arguments, argumentNames,
+                                    cnt, appendTo, success);
+        } else if (UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE(argType)) {
+            if (!arg->isNumeric()) {
+                success = U_ILLEGAL_ARGUMENT_ERROR;
+                return;

             }
             }

+            const PluralSelectorProvider &selector =
+                argType == UMSGPAT_ARG_TYPE_PLURAL ? pluralProvider : ordinalProvider;
+            // We must use the Formattable::getDouble() variant with the UErrorCode parameter
+            // because only this one converts non-double numeric types to double.
+            double offset = msgPattern.getPluralOffset(i);
+            PluralSelectorContext context(i, argName, *arg, offset, success);
+            int32_t subMsgStart = PluralFormat::findSubMessage(
+                    msgPattern, i, selector, &context, arg->getDouble(success), success);
+            formatComplexSubMessage(subMsgStart, &context, arguments, argumentNames,
+                                    cnt, appendTo, success);
+        } else if (argType == UMSGPAT_ARG_TYPE_SELECT) {
+            int32_t subMsgStart = SelectFormat::findSubMessage(msgPattern, i, arg->getString(success), success);
+            formatComplexSubMessage(subMsgStart, NULL, arguments, argumentNames,
+                                    cnt, appendTo, success);
+        } else {
+            // This should never happen.
+            success = U_INTERNAL_PROGRAM_ERROR;
+            return;

         }
         }

-        // If the obj data type is a Date instance, use a DateFormat instance.
-        else if (type == Formattable::kDate) {
-            const DateFormat* df = getDefaultDateFormat(success);
-            if (df == NULL) {
-                return appendTo;
+        ignore = updateMetaData(appendTo, prevDestLength, ignore, arg);
+        prevIndex = msgPattern.getPart(argLimit).getLimit();
+        i = argLimit;
+    }
+}
+
+
+void MessageFormat::formatComplexSubMessage(int32_t msgStart,
+                                            const void *plNumber,
+                                            const Formattable* arguments,
+                                            const UnicodeString *argumentNames,
+                                            int32_t cnt,
+                                            AppendableWrapper& appendTo,
+                                            UErrorCode& success) const {
+    if (U_FAILURE(success)) {
+        return;
+    }
+
+    if (!MessageImpl::jdkAposMode(msgPattern)) {
+        format(msgStart, plNumber, arguments, argumentNames, cnt, appendTo, NULL, success);
+        return;
+    }
+
+    // JDK compatibility mode: (see JDK MessageFormat.format() API docs)
+    // - remove SKIP_SYNTAX; that is, remove half of the apostrophes
+    // - if the result string contains an open curly brace '{' then
+    //   instantiate a temporary MessageFormat object and format again;
+    //   otherwise just append the result string
+    const UnicodeString& msgString = msgPattern.getPatternString();
+    UnicodeString sb;
+    int32_t prevIndex = msgPattern.getPart(msgStart).getLimit();
+    for (int32_t i = msgStart;;) {
+        const MessagePattern::Part& part = msgPattern.getPart(++i);
+        const UMessagePatternPartType type = part.getType();
+        int32_t index = part.getIndex();
+        if (type == UMSGPAT_PART_TYPE_MSG_LIMIT) {
+            sb.append(msgString, prevIndex, index - prevIndex);
+            break;
+        } else if (type == UMSGPAT_PART_TYPE_REPLACE_NUMBER || type == UMSGPAT_PART_TYPE_SKIP_SYNTAX) {
+            sb.append(msgString, prevIndex, index - prevIndex);
+            if (type == UMSGPAT_PART_TYPE_REPLACE_NUMBER) {
+                const PluralSelectorContext &pluralNumber =
+                    *static_cast<const PluralSelectorContext *>(plNumber);
+                if(pluralNumber.forReplaceNumber) {
+                    // number-offset was already formatted.
+                    sb.append(pluralNumber.numberString);
+                } else {
+                    const NumberFormat* nf = getDefaultNumberFormat(success);
+                    sb.append(nf->format(pluralNumber.number, sb, success));
+                }

             }
             }

-            df->format(obj->getDate(), appendTo);
+            prevIndex = part.getLimit();
+        } else if (type == UMSGPAT_PART_TYPE_ARG_START) {
+            sb.append(msgString, prevIndex, index - prevIndex);
+            prevIndex = index;
+            i = msgPattern.getLimitPartIndex(i);
+            index = msgPattern.getPart(i).getLimit();
+            MessageImpl::appendReducedApostrophes(msgString, prevIndex, index, sb);
+            prevIndex = index;
+        }
+    }
+    if (sb.indexOf(LEFT_CURLY_BRACE) >= 0) {
+        UnicodeString emptyPattern;  // gcc 3.3.3 fails with "UnicodeString()" as the first parameter.
+        MessageFormat subMsgFormat(emptyPattern, fLocale, success);
+        subMsgFormat.applyPattern(sb, UMSGPAT_APOS_DOUBLE_REQUIRED, NULL, success);
+        subMsgFormat.format(0, NULL, arguments, argumentNames, cnt, appendTo, NULL, success);
+    } else {
+        appendTo.append(sb);
+    }
+}
+
+
+UnicodeString MessageFormat::getLiteralStringUntilNextArgument(int32_t from) const {
+    const UnicodeString& msgString=msgPattern.getPatternString();
+    int32_t prevIndex=msgPattern.getPart(from).getLimit();
+    UnicodeString b;
+    for (int32_t i = from + 1; ; ++i) {
+        const MessagePattern::Part& part = msgPattern.getPart(i);
+        const UMessagePatternPartType type=part.getType();
+        int32_t index=part.getIndex();
+        b.append(msgString, prevIndex, index - prevIndex);
+        if(type==UMSGPAT_PART_TYPE_ARG_START || type==UMSGPAT_PART_TYPE_MSG_LIMIT) {
+            return b;
+        }
+        // Unexpected Part "part" in parsed message.
+        U_ASSERT(type==UMSGPAT_PART_TYPE_SKIP_SYNTAX || type==UMSGPAT_PART_TYPE_INSERT_CHAR);
+        prevIndex=part.getLimit();
+    }
+}
+
+
+FieldPosition* MessageFormat::updateMetaData(AppendableWrapper& /*dest*/, int32_t /*prevLength*/,
+                             FieldPosition* /*fp*/, const Formattable* /*argId*/) const {
+    // Unlike in Java, there are no field attributes defined for MessageFormat. Do nothing.
+    return NULL;
+    /*
+      if (fp != NULL && Field.ARGUMENT.equals(fp.getFieldAttribute())) {
+          fp->setBeginIndex(prevLength);
+          fp->setEndIndex(dest.get_length());
+          return NULL;
+      }
+      return fp;
+    */
+}
+
+int32_t
+MessageFormat::findOtherSubMessage(int32_t partIndex) const {
+    int32_t count=msgPattern.countParts();
+    const MessagePattern::Part *part = &msgPattern.getPart(partIndex);
+    if(MessagePattern::Part::hasNumericValue(part->getType())) {
+        ++partIndex;
+    }
+    // Iterate over (ARG_SELECTOR [ARG_INT|ARG_DOUBLE] message) tuples
+    // until ARG_LIMIT or end of plural-only pattern.
+    UnicodeString other(FALSE, OTHER_STRING, 5);
+    do {
+        part=&msgPattern.getPart(partIndex++);
+        UMessagePatternPartType type=part->getType();
+        if(type==UMSGPAT_PART_TYPE_ARG_LIMIT) {
+            break;

         }
         }

-        else if (type == Formattable::kString) {
-            appendTo += obj->getString();
+        U_ASSERT(type==UMSGPAT_PART_TYPE_ARG_SELECTOR);
+        // part is an ARG_SELECTOR followed by an optional explicit value, and then a message
+        if(msgPattern.partSubstringMatches(*part, other)) {
+            return partIndex;

         }
         }

-        else {
-            success = U_ILLEGAL_ARGUMENT_ERROR;
-            return appendTo;
+        if(MessagePattern::Part::hasNumericValue(msgPattern.getPartType(partIndex))) {
+            ++partIndex;  // skip the numeric-value part of "=1" etc.
+        }
+        partIndex=msgPattern.getLimitPartIndex(partIndex);
+    } while(++partIndex<count);
+    return 0;
+}
+
+int32_t
+MessageFormat::findFirstPluralNumberArg(int32_t msgStart, const UnicodeString &argName) const {
+    for(int32_t i=msgStart+1;; ++i) {
+        const MessagePattern::Part &part=msgPattern.getPart(i);
+        UMessagePatternPartType type=part.getType();
+        if(type==UMSGPAT_PART_TYPE_MSG_LIMIT) {
+            return 0;
+        }
+        if(type==UMSGPAT_PART_TYPE_REPLACE_NUMBER) {
+            return -1;
+        }
+        if(type==UMSGPAT_PART_TYPE_ARG_START) {
+            UMessagePatternArgType argType=part.getArgType();
+            if(!argName.isEmpty() && (argType==UMSGPAT_ARG_TYPE_NONE || argType==UMSGPAT_ARG_TYPE_SIMPLE)) {
+                // ARG_NUMBER or ARG_NAME
+                if(msgPattern.partSubstringMatches(msgPattern.getPart(i+1), argName)) {
+                    return i;
+                }
+            }
+            i=msgPattern.getLimitPartIndex(i);

         }
     }
         }
     }

-    // Appends the rest of the pattern characters after the real last offset.
-    appendTo.append(fPattern, lastOffset, 0x7fffffff);
-    return appendTo;

 }
 
 }
 

+void MessageFormat::copyObjects(const MessageFormat& that, UErrorCode& ec) {
+    // Deep copy pointer fields.
+    // We need not copy the formatAliases because they are re-filled
+    // in each getFormats() call.
+    // The defaultNumberFormat, defaultDateFormat and pluralProvider.rules
+    // also get created on demand.
+    argTypeCount = that.argTypeCount;
+    if (argTypeCount > 0) {
+        if (!allocateArgTypes(argTypeCount, ec)) {
+            return;
+        }
+        uprv_memcpy(argTypes, that.argTypes, argTypeCount * sizeof(argTypes[0]));
+    }
+    if (cachedFormatters != NULL) {
+        uhash_removeAll(cachedFormatters);
+    }
+    if (customFormatArgStarts != NULL) {
+        uhash_removeAll(customFormatArgStarts);
+    }
+    if (that.cachedFormatters) {
+        if (cachedFormatters == NULL) {
+            cachedFormatters=uhash_open(uhash_hashLong, uhash_compareLong,
+                                        equalFormatsForHash, &ec);
+            if (U_FAILURE(ec)) {
+                return;
+            }
+            uhash_setValueDeleter(cachedFormatters, uprv_deleteUObject);
+        }
+
+        const int32_t count = uhash_count(that.cachedFormatters);
+        int32_t pos, idx;
+        for (idx = 0, pos = UHASH_FIRST; idx < count && U_SUCCESS(ec); ++idx) {
+            const UHashElement* cur = uhash_nextElement(that.cachedFormatters, &pos);
+            Format* newFormat = ((Format*)(cur->value.pointer))->clone();
+            if (newFormat) {
+                uhash_iput(cachedFormatters, cur->key.integer, newFormat, &ec);
+            } else {
+                ec = U_MEMORY_ALLOCATION_ERROR;
+                return;
+            }
+        }
+    }
+    if (that.customFormatArgStarts) {
+        if (customFormatArgStarts == NULL) {
+            customFormatArgStarts=uhash_open(uhash_hashLong, uhash_compareLong,
+                                              NULL, &ec);
+        }
+        const int32_t count = uhash_count(that.customFormatArgStarts);
+        int32_t pos, idx;
+        for (idx = 0, pos = UHASH_FIRST; idx < count && U_SUCCESS(ec); ++idx) {
+            const UHashElement* cur = uhash_nextElement(that.customFormatArgStarts, &pos);
+            uhash_iputi(customFormatArgStarts, cur->key.integer, cur->value.integer, &ec);
+        }
+    }
+}

 
 

-// -------------------------------------
-// Parses the source pattern and returns the Formattable objects array,
-// the array count and the ending parse position.  The caller of this method
-// owns the array.

 
 Formattable*
 
 Formattable*

-MessageFormat::parse(const UnicodeString& source,
+MessageFormat::parse(int32_t msgStart,
+                     const UnicodeString& source,

                      ParsePosition& pos,
                      ParsePosition& pos,

-                     int32_t& count) const
-{
-    // Allocate at least one element.  Allocating an array of length
-    // zero causes problems on some platforms (e.g. Win32).
-    Formattable *resultArray = new Formattable[argTypeCount ? argTypeCount : 1];
-    int32_t patternOffset = 0;
+                     int32_t& count,
+                     UErrorCode& ec) const {
+    count = 0;
+    if (U_FAILURE(ec)) {
+        pos.setErrorIndex(pos.getIndex());
+        return NULL;
+    }
+    // parse() does not work with named arguments.
+    if (msgPattern.hasNamedArguments()) {
+        ec = U_ARGUMENT_TYPE_MISMATCH;
+        pos.setErrorIndex(pos.getIndex());
+        return NULL;
+    }
+    LocalArray<Formattable> resultArray(new Formattable[argTypeCount ? argTypeCount : 1]);
+    const UnicodeString& msgString=msgPattern.getPatternString();
+    int32_t prevIndex=msgPattern.getPart(msgStart).getLimit();

     int32_t sourceOffset = pos.getIndex();
     int32_t sourceOffset = pos.getIndex();

-    ParsePosition tempPos(0);
-    count = 0; // {sfb} reset to zero
-    int32_t len;
-    // If resultArray could not be created, exit out.
-    // Avoid crossing initialization of variables above.
-    if (resultArray == NULL) {
-        goto PARSE_ERROR;
-    }
-    for (int32_t i = 0; i < subformatCount; ++i) {
-        // match up to format
-        len = subformats[i].offset - patternOffset;
-        if (len == 0 ||
-            fPattern.compare(patternOffset, len, source, sourceOffset, len) == 0) {
+    ParsePosition tempStatus(0);
+
+    for(int32_t i=msgStart+1; ; ++i) {
+        UBool haveArgResult = FALSE;
+        const MessagePattern::Part* part=&msgPattern.getPart(i);
+        const UMessagePatternPartType type=part->getType();
+        int32_t index=part->getIndex();
+        // Make sure the literal string matches.
+        int32_t len = index - prevIndex;
+        if (len == 0 || (0 == msgString.compare(prevIndex, len, source, sourceOffset, len))) {

             sourceOffset += len;
             sourceOffset += len;

-            patternOffset += len;
+            prevIndex += len;
+        } else {
+            pos.setErrorIndex(sourceOffset);
+            return NULL; // leave index as is to signal error

         }
         }

-        else {
-            goto PARSE_ERROR;
+        if(type==UMSGPAT_PART_TYPE_MSG_LIMIT) {
+            // Things went well! Done.
+            pos.setIndex(sourceOffset);
+            return resultArray.orphan();

         }
         }

-
-        // now use format
-        Format* fmt = subformats[i].format;
-        int32_t argNum = subformats[i].argNum;
-        if (fmt == NULL) {   // string format
+        if(type==UMSGPAT_PART_TYPE_SKIP_SYNTAX || type==UMSGPAT_PART_TYPE_INSERT_CHAR) {
+            prevIndex=part->getLimit();
+            continue;
+        }
+        // We do not support parsing Plural formats. (No REPLACE_NUMBER here.)
+        // Unexpected Part "part" in parsed message.
+        U_ASSERT(type==UMSGPAT_PART_TYPE_ARG_START);
+        int32_t argLimit=msgPattern.getLimitPartIndex(i);
+
+        UMessagePatternArgType argType=part->getArgType();
+        part=&msgPattern.getPart(++i);
+        int32_t argNumber = part->getValue();  // ARG_NUMBER
+        UnicodeString key;
+        ++i;
+        const Format* formatter = NULL;
+        Formattable& argResult = resultArray[argNumber];
+
+        if(cachedFormatters!=NULL && (formatter = getCachedFormatter(i - 2))!=NULL) {
+            // Just parse using the formatter.
+            tempStatus.setIndex(sourceOffset);
+            formatter->parseObject(source, argResult, tempStatus);
+            if (tempStatus.getIndex() == sourceOffset) {
+                pos.setErrorIndex(sourceOffset);
+                return NULL; // leave index as is to signal error
+            }
+            sourceOffset = tempStatus.getIndex();
+            haveArgResult = TRUE;
+        } else if(
+            argType==UMSGPAT_ARG_TYPE_NONE || (cachedFormatters && uhash_iget(cachedFormatters, i -2))) {
+            // We arrive here if getCachedFormatter returned NULL, but there was actually an element in the hash table.
+            // This can only happen if the hash table contained a DummyFormat, so the if statement above is a check
+            // for the hash table containind DummyFormat.
+
+            // Match as a string.

             // if at end, use longest possible match
             // otherwise uses first match to intervening string
             // does NOT recursively try all possibilities
             // if at end, use longest possible match
             // otherwise uses first match to intervening string
             // does NOT recursively try all possibilities

-            int32_t tempLength = (i+1<subformatCount) ?
-                subformats[i+1].offset : fPattern.length();
-
+            UnicodeString stringAfterArgument = getLiteralStringUntilNextArgument(argLimit);

             int32_t next;
             int32_t next;

-            if (patternOffset >= tempLength) {
+            if (!stringAfterArgument.isEmpty()) {
+                next = source.indexOf(stringAfterArgument, sourceOffset);
+            } else {

                 next = source.length();
             }
                 next = source.length();
             }

-            else {
-                UnicodeString buffer;
-                fPattern.extract(patternOffset,tempLength - patternOffset, buffer);
-                next = source.indexOf(buffer, sourceOffset);
-            }
-

             if (next < 0) {
             if (next < 0) {

-                goto PARSE_ERROR;
-            }
-            else {
-                UnicodeString buffer;
-                source.extract(sourceOffset,next - sourceOffset, buffer);
-                UnicodeString strValue = buffer;
-                UnicodeString temp(LEFT_CURLY_BRACE);
-                // {sfb} check this later
-                if (isArgNumeric) {
-                    itos(argNum, temp);
-                }
-                else {
-                    temp+=(*subformats[i].argName);
-                }
-                temp += RIGHT_CURLY_BRACE;
-                if (strValue != temp) {
-                    source.extract(sourceOffset,next - sourceOffset, buffer);
-                    resultArray[argNum].setString(buffer);
-                    // {sfb} not sure about this
-                    if ((argNum + 1) > count) {
-                        count = argNum + 1;
-                    }
+                pos.setErrorIndex(sourceOffset);
+                return NULL; // leave index as is to signal error
+            } else {
+                UnicodeString strValue(source.tempSubString(sourceOffset, next - sourceOffset));
+                UnicodeString compValue;
+                compValue.append(LEFT_CURLY_BRACE);
+                itos(argNumber, compValue);
+                compValue.append(RIGHT_CURLY_BRACE);
+                if (0 != strValue.compare(compValue)) {
+                    argResult.setString(strValue);
+                    haveArgResult = TRUE;

                 }
                 sourceOffset = next;
             }
                 }
                 sourceOffset = next;
             }

-        }
-        else {
-            tempPos.setIndex(sourceOffset);
-            fmt->parseObject(source, resultArray[argNum], tempPos);
-            if (tempPos.getIndex() == sourceOffset) {
-                goto PARSE_ERROR;
-            }
-
-            if ((argNum + 1) > count) {
-                count = argNum + 1;
+        } else if(argType==UMSGPAT_ARG_TYPE_CHOICE) {
+            tempStatus.setIndex(sourceOffset);
+            double choiceResult = ChoiceFormat::parseArgument(msgPattern, i, source, tempStatus);
+            if (tempStatus.getIndex() == sourceOffset) {
+                pos.setErrorIndex(sourceOffset);
+                return NULL; // leave index as is to signal error

             }
             }

-            sourceOffset = tempPos.getIndex(); // update
+            argResult.setDouble(choiceResult);
+            haveArgResult = TRUE;
+            sourceOffset = tempStatus.getIndex();
+        } else if(UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE(argType) || argType==UMSGPAT_ARG_TYPE_SELECT) {
+            // Parsing not supported.
+            ec = U_UNSUPPORTED_ERROR;
+            return NULL;
+        } else {
+            // This should never happen.
+            ec = U_INTERNAL_PROGRAM_ERROR;
+            return NULL;

         }
         }

+        if (haveArgResult && count <= argNumber) {
+            count = argNumber + 1;
+        }
+        prevIndex=msgPattern.getPart(argLimit).getLimit();
+        i=argLimit;

     }
     }

-    len = fPattern.length() - patternOffset;
-    if (len == 0 ||
-        fPattern.compare(patternOffset, len, source, sourceOffset, len) == 0) {
-        pos.setIndex(sourceOffset + len);
-        return resultArray;
-    }
-    // else fall through...
+}
+// -------------------------------------
+// Parses the source pattern and returns the Formattable objects array,
+// the array count and the ending parse position.  The caller of this method
+// owns the array.

 
 

- PARSE_ERROR:
-    pos.setErrorIndex(sourceOffset);
-    delete [] resultArray;
-    count = 0;
-    return NULL; // leave index as is to signal error
+Formattable*
+MessageFormat::parse(const UnicodeString& source,
+                     ParsePosition& pos,
+                     int32_t& count) const {
+    UErrorCode ec = U_ZERO_ERROR;
+    return parse(0, source, pos, count, ec);

 }
 
 // -------------------------------------
 }
 
 // -------------------------------------


@@ -1426,7 +1509,7 @@ MessageFormat::parse(const UnicodeString& source,
                      int32_t& cnt,
                      UErrorCode& success) const
 {
                      int32_t& cnt,
                      UErrorCode& success) const
 {

-    if (!isArgNumeric ) {
+    if (msgPattern.hasNamedArguments()) {

         success = U_ARGUMENT_TYPE_MISMATCH;
         return NULL;
     }
         success = U_ARGUMENT_TYPE_MISMATCH;
         return NULL;
     }


@@ -1458,23 +1541,23 @@ MessageFormat::parseObject( const UnicodeString& source,
 
 UnicodeString
 MessageFormat::autoQuoteApostrophe(const UnicodeString& pattern, UErrorCode& status) {
 
 UnicodeString
 MessageFormat::autoQuoteApostrophe(const UnicodeString& pattern, UErrorCode& status) {

-  UnicodeString result;
-  if (U_SUCCESS(status)) {
-    int32_t plen = pattern.length();
-    const UChar* pat = pattern.getBuffer();
-    int32_t blen = plen * 2 + 1; // space for null termination, convenience
-    UChar* buf = result.getBuffer(blen);
-    if (buf == NULL) {
-      status = U_MEMORY_ALLOCATION_ERROR;
-    } else {
-      int32_t len = umsg_autoQuoteApostrophe(pat, plen, buf, blen, &status);
-      result.releaseBuffer(U_SUCCESS(status) ? len : 0);
+    UnicodeString result;
+    if (U_SUCCESS(status)) {
+        int32_t plen = pattern.length();
+        const UChar* pat = pattern.getBuffer();
+        int32_t blen = plen * 2 + 1; // space for null termination, convenience
+        UChar* buf = result.getBuffer(blen);
+        if (buf == NULL) {
+            status = U_MEMORY_ALLOCATION_ERROR;
+        } else {
+            int32_t len = umsg_autoQuoteApostrophe(pat, plen, buf, blen, &status);
+            result.releaseBuffer(U_SUCCESS(status) ? len : 0);
+        }

     }
     }

-  }
-  if (U_FAILURE(status)) {
-    result.setToBogus();
-  }
-  return result;
+    if (U_FAILURE(status)) {
+        result.setToBogus();
+    }
+    return result;

 }
 
 // -------------------------------------
 }
 
 // -------------------------------------


@@ -1490,64 +1573,118 @@ static Format* makeRBNF(URBNFRuleSetTag tag, const Locale& locale, const Unicode
     return fmt;
 }
 
     return fmt;
 }
 

-/**
- * Reads the segments[] array (see applyPattern()) and parses the
- * segments[1..3] into a Format* object.  Stores the format object in
- * the subformats[] array.  Updates the argTypes[] array type
- * information for the corresponding argument.
- *
- * @param formatNumber index into subformats[] for this format
- * @param segments array of strings with the parsed pattern segments
- * @param parseError parse error data (output param)
- * @param ec error code
- */
-void
-MessageFormat::makeFormat(int32_t formatNumber,
-                          UnicodeString* segments,
-                          UParseError& parseError,
-                          UErrorCode& ec) {
-    if (U_FAILURE(ec)) {
+void MessageFormat::cacheExplicitFormats(UErrorCode& status) {
+    if (U_FAILURE(status)) {

         return;
     }
 
         return;
     }
 

-    // Parse the argument number
-    int32_t argumentNumber = stou(segments[1]); // always unlocalized!
-    UnicodeString argumentName;
-    if (argumentNumber < 0) {
-        if ( (isArgNumeric==TRUE) && (formatNumber !=0) ) {
-            ec = U_INVALID_FORMAT_ERROR;
-            return;
-        }
-        isArgNumeric = FALSE;
-        argumentNumber=formatNumber;
+    if (cachedFormatters != NULL) {
+        uhash_removeAll(cachedFormatters);

     }
     }

-    if (!isArgNumeric) {
-        if ( !isLegalArgName(segments[1]) ) {
-            ec = U_INVALID_FORMAT_ERROR;
-            return;
+    if (customFormatArgStarts != NULL) {
+        uhash_removeAll(customFormatArgStarts);
+    }
+
+    // The last two "parts" can at most be ARG_LIMIT and MSG_LIMIT
+    // which we need not examine.
+    int32_t limit = msgPattern.countParts() - 2;
+    argTypeCount = 0;
+    // We also need not look at the first two "parts"
+    // (at most MSG_START and ARG_START) in this loop.
+    // We determine the argTypeCount first so that we can allocateArgTypes
+    // so that the next loop can set argTypes[argNumber].
+    // (This is for the C API which needs the argTypes to read its va_arg list.)
+    for (int32_t i = 2; i < limit && U_SUCCESS(status); ++i) {
+        const MessagePattern::Part& part = msgPattern.getPart(i);
+        if (part.getType() == UMSGPAT_PART_TYPE_ARG_NUMBER) {
+            const int argNumber = part.getValue();
+            if (argNumber >= argTypeCount) {
+                argTypeCount = argNumber + 1;
+            }

         }
         }

-        argumentName = segments[1];

     }
     }

+    if (!allocateArgTypes(argTypeCount, status)) {
+        return;
+    }
+    // Set all argTypes to kObject, as a "none" value, for lack of any better value.
+    // We never use kObject for real arguments.
+    // We use it as "no argument yet" for the check for hasArgTypeConflicts.
+    for (int32_t i = 0; i < argTypeCount; ++i) {
+        argTypes[i] = Formattable::kObject;
+    }
+    hasArgTypeConflicts = FALSE;

 
 

-    // Parse the format, recording the argument type and creating a
-    // new Format object (except for string arguments).
-    Formattable::Type argType;
-    Format *fmt = NULL;
-    int32_t typeID, styleID;
-    DateFormat::EStyle style;
-    UnicodeString unquotedPattern, quotedPattern;
-    UBool inQuote = FALSE;
+    // This loop starts at part index 1 because we do need to examine
+    // ARG_START parts. (But we can ignore the MSG_START.)
+    for (int32_t i = 1; i < limit && U_SUCCESS(status); ++i) {
+        const MessagePattern::Part* part = &msgPattern.getPart(i);
+        if (part->getType() != UMSGPAT_PART_TYPE_ARG_START) {
+            continue;
+        }
+        UMessagePatternArgType argType = part->getArgType();

 
 

-    switch (typeID = findKeyword(segments[2], TYPE_IDS)) {
+        int32_t argNumber = -1;
+        part = &msgPattern.getPart(i + 1);
+        if (part->getType() == UMSGPAT_PART_TYPE_ARG_NUMBER) {
+            argNumber = part->getValue();
+        }
+        Formattable::Type formattableType;

 
 

-    case 0: // string
-        argType = Formattable::kString;
-        break;
+        switch (argType) {
+        case UMSGPAT_ARG_TYPE_NONE:
+            formattableType = Formattable::kString;
+            break;
+        case UMSGPAT_ARG_TYPE_SIMPLE: {
+            int32_t index = i;
+            i += 2;
+            UnicodeString explicitType = msgPattern.getSubstring(msgPattern.getPart(i++));
+            UnicodeString style;
+            if ((part = &msgPattern.getPart(i))->getType() == UMSGPAT_PART_TYPE_ARG_STYLE) {
+                style = msgPattern.getSubstring(*part);
+                ++i;
+            }
+            UParseError parseError;
+            Format* formatter = createAppropriateFormat(explicitType, style, formattableType, parseError, status);
+            setArgStartFormat(index, formatter, status);
+            break;
+        }
+        case UMSGPAT_ARG_TYPE_CHOICE:
+        case UMSGPAT_ARG_TYPE_PLURAL:
+        case UMSGPAT_ARG_TYPE_SELECTORDINAL:
+            formattableType = Formattable::kDouble;
+            break;
+        case UMSGPAT_ARG_TYPE_SELECT:
+            formattableType = Formattable::kString;
+            break;
+        default:
+            status = U_INTERNAL_PROGRAM_ERROR;  // Should be unreachable.
+            formattableType = Formattable::kString;
+            break;
+        }
+        if (argNumber != -1) {
+            if (argTypes[argNumber] != Formattable::kObject && argTypes[argNumber] != formattableType) {
+                hasArgTypeConflicts = TRUE;
+            }
+            argTypes[argNumber] = formattableType;
+        }
+    }
+}

 
 

-    case 1: // number
-        argType = Formattable::kDouble;

 
 

-        switch (findKeyword(segments[3], NUMBER_STYLE_IDS)) {
+Format* MessageFormat::createAppropriateFormat(UnicodeString& type, UnicodeString& style,
+                                               Formattable::Type& formattableType, UParseError& parseError,
+                                               UErrorCode& ec) {
+    if (U_FAILURE(ec)) {
+        return NULL;
+    }
+    Format* fmt = NULL;
+    int32_t typeID, styleID;
+    DateFormat::EStyle date_style;
+
+    switch (typeID = findKeyword(type, TYPE_IDS)) {
+    case 0: // number
+        formattableType = Formattable::kDouble;
+        switch (findKeyword(style, NUMBER_STYLE_IDS)) {

         case 0: // default
             fmt = NumberFormat::createInstance(fLocale, ec);
             break;
         case 0: // default
             fmt = NumberFormat::createInstance(fLocale, ec);
             break;


@@ -1558,7 +1695,7 @@ MessageFormat::makeFormat(int32_t formatNumber,
             fmt = NumberFormat::createPercentInstance(fLocale, ec);
             break;
         case 3: // integer
             fmt = NumberFormat::createPercentInstance(fLocale, ec);
             break;
         case 3: // integer

-            argType = Formattable::kLong;
+            formattableType = Formattable::kLong;

             fmt = createIntegerFormat(fLocale, ec);
             break;
         default: // pattern
             fmt = createIntegerFormat(fLocale, ec);
             break;
         default: // pattern


@@ -1566,131 +1703,70 @@ MessageFormat::makeFormat(int32_t formatNumber,
             if (fmt) {
                 DecimalFormat* decfmt = dynamic_cast<DecimalFormat*>(fmt);
                 if (decfmt != NULL) {
             if (fmt) {
                 DecimalFormat* decfmt = dynamic_cast<DecimalFormat*>(fmt);
                 if (decfmt != NULL) {

-                    decfmt->applyPattern(segments[3],parseError,ec);
+                    decfmt->applyPattern(style,parseError,ec);

                 }
             }
             break;
         }
         break;
 
                 }
             }
             break;
         }
         break;
 

-    case 2: // date
-    case 3: // time
-        argType = Formattable::kDate;
-        styleID = findKeyword(segments[3], DATE_STYLE_IDS);
-        style = (styleID >= 0) ? DATE_STYLES[styleID] : DateFormat::kDefault;
+    case 1: // date
+    case 2: // time
+        formattableType = Formattable::kDate;
+        styleID = findKeyword(style, DATE_STYLE_IDS);
+        date_style = (styleID >= 0) ? DATE_STYLES[styleID] : DateFormat::kDefault;

 
 

-        if (typeID == 2) {
-            fmt = DateFormat::createDateInstance(style, fLocale);
+        if (typeID == 1) {
+            fmt = DateFormat::createDateInstance(date_style, fLocale);

         } else {
         } else {

-            fmt = DateFormat::createTimeInstance(style, fLocale);
+            fmt = DateFormat::createTimeInstance(date_style, fLocale);

         }
 
         if (styleID < 0 && fmt != NULL) {
             SimpleDateFormat* sdtfmt = dynamic_cast<SimpleDateFormat*>(fmt);
             if (sdtfmt != NULL) {
         }
 
         if (styleID < 0 && fmt != NULL) {
             SimpleDateFormat* sdtfmt = dynamic_cast<SimpleDateFormat*>(fmt);
             if (sdtfmt != NULL) {

-                sdtfmt->applyPattern(segments[3]);
+                sdtfmt->applyPattern(style);

             }
         }
         break;
 
             }
         }
         break;
 

-    case 4: // choice
-        argType = Formattable::kDouble;
-
-        fmt = new ChoiceFormat(segments[3], parseError, ec);
-        break;
-
-    case 5: // spellout
-        argType = Formattable::kDouble;
-        fmt = makeRBNF(URBNF_SPELLOUT, fLocale, segments[3], ec);
+    case 3: // spellout
+        formattableType = Formattable::kDouble;
+        fmt = makeRBNF(URBNF_SPELLOUT, fLocale, style, ec);

         break;
         break;

-    case 6: // ordinal
-        argType = Formattable::kDouble;
-        fmt = makeRBNF(URBNF_ORDINAL, fLocale, segments[3], ec);
+    case 4: // ordinal
+        formattableType = Formattable::kDouble;
+        fmt = makeRBNF(URBNF_ORDINAL, fLocale, style, ec);

         break;
         break;

-    case 7: // duration
-        argType = Formattable::kDouble;
-        fmt = makeRBNF(URBNF_DURATION, fLocale, segments[3], ec);
-        break;
-    case 8: // plural
-    case 9: // Select
-        if(typeID == 8)
-            argType = Formattable::kDouble;
-        else
-            argType = Formattable::kString;
-        quotedPattern = segments[3];
-        for (int32_t i = 0; i < quotedPattern.length(); ++i) {
-            UChar ch = quotedPattern.charAt(i);
-            if (ch == SINGLE_QUOTE) {
-                if (i+1 < quotedPattern.length() && quotedPattern.charAt(i+1)==SINGLE_QUOTE) {
-                    unquotedPattern+=ch;
-                    ++i;
-                }
-                else {
-                    inQuote = !inQuote;
-                }
-            }
-            else {
-                unquotedPattern += ch;
-            }
-        }
-        if(typeID == 8)
-            fmt = new PluralFormat(fLocale, unquotedPattern, ec);
-        else
-            fmt = new SelectFormat(unquotedPattern, ec);
+    case 5: // duration
+        formattableType = Formattable::kDouble;
+        fmt = makeRBNF(URBNF_DURATION, fLocale, style, ec);

         break;
     default:
         break;
     default:

-        argType = Formattable::kString;
+        formattableType = Formattable::kString;

         ec = U_ILLEGAL_ARGUMENT_ERROR;
         break;
     }
 
         ec = U_ILLEGAL_ARGUMENT_ERROR;
         break;
     }
 

-    if (fmt==NULL && argType!=Formattable::kString && U_SUCCESS(ec)) {
-        ec = U_MEMORY_ALLOCATION_ERROR;
-    }
-
-    if (!allocateSubformats(formatNumber+1) ||
-        !allocateArgTypes(argumentNumber+1)) {
-        ec = U_MEMORY_ALLOCATION_ERROR;
-    }
-
-    if (U_FAILURE(ec)) {
-        delete fmt;
-        return;
-    }
-
-    // Parse succeeded; record results in our arrays
-    subformats[formatNumber].format = fmt;
-    subformats[formatNumber].offset = segments[0].length();
-    if (isArgNumeric) {
-        subformats[formatNumber].argName = NULL;
-        subformats[formatNumber].argNum = argumentNumber;
-    }
-    else {
-        subformats[formatNumber].argName = new UnicodeString(argumentName);
-        subformats[formatNumber].argNum = -1;
-    }
-    subformatCount = formatNumber+1;
-
-    // Careful here: argumentNumber may in general arrive out of
-    // sequence, e.g., "There was {2} on {0,date} (see {1,number})."
-    argTypes[argumentNumber] = argType;
-    if (argumentNumber+1 > argTypeCount) {
-        argTypeCount = argumentNumber+1;
-    }
+    return fmt;

 }
 
 }
 

-// -------------------------------------
+
+//-------------------------------------

 // Finds the string, s, in the string array, list.
 int32_t MessageFormat::findKeyword(const UnicodeString& s,
                                    const UChar * const *list)
 {
 // Finds the string, s, in the string array, list.
 int32_t MessageFormat::findKeyword(const UnicodeString& s,
                                    const UChar * const *list)
 {

-    if (s.length() == 0)
+    if (s.isEmpty()) {

         return 0; // default
         return 0; // default

+    }

 
 

-    UnicodeString buffer = s;
+    int32_t length = s.length();
+    const UChar *ps = PatternProps::trimWhiteSpace(s.getBuffer(), length);
+    UnicodeString buffer(FALSE, ps, length);

     // Trims the space characters and turns all characters
     // in s to lower case.
     // Trims the space characters and turns all characters
     // in s to lower case.

-    buffer.trim().toLower("");
+    buffer.toLower("");

     for (int32_t i = 0; list[i]; ++i) {
         if (!buffer.compare(list[i], u_strlen(list[i]))) {
             return i;
     for (int32_t i = 0; list[i]; ++i) {
         if (!buffer.compare(list[i], u_strlen(list[i]))) {
             return i;


@@ -1699,48 +1775,6 @@ int32_t MessageFormat::findKeyword(const UnicodeString& s,
     return -1;
 }
 
     return -1;
 }
 

-// -------------------------------------
-// Checks the range of the source text to quote the special
-// characters, { and ' and copy to target buffer.
-
-void
-MessageFormat::copyAndFixQuotes(const UnicodeString& source,
-                                int32_t start,
-                                int32_t end,
-                                UnicodeString& appendTo)
-{
-    UBool gotLB = FALSE;
-
-    for (int32_t i = start; i < end; ++i) {
-        UChar ch = source[i];
-        if (ch == LEFT_CURLY_BRACE) {
-            appendTo += SINGLE_QUOTE;
-            appendTo += LEFT_CURLY_BRACE;
-            appendTo += SINGLE_QUOTE;
-            gotLB = TRUE;
-        }
-        else if (ch == RIGHT_CURLY_BRACE) {
-            if(gotLB) {
-                appendTo += RIGHT_CURLY_BRACE;
-                gotLB = FALSE;
-            }
-            else {
-                // orig code.
-                appendTo += SINGLE_QUOTE;
-                appendTo += RIGHT_CURLY_BRACE;
-                appendTo += SINGLE_QUOTE;
-            }
-        }
-        else if (ch == SINGLE_QUOTE) {
-            appendTo += SINGLE_QUOTE;
-            appendTo += SINGLE_QUOTE;
-        }
-        else {
-            appendTo += ch;
-        }
-    }
-}
-

 /**
  * Convenience method that ought to be in NumberFormat
  */
 /**
  * Convenience method that ought to be in NumberFormat
  */


@@ -1798,27 +1832,62 @@ const DateFormat* MessageFormat::getDefaultDateFormat(UErrorCode& ec) const {
 
 UBool
 MessageFormat::usesNamedArguments() const {
 
 UBool
 MessageFormat::usesNamedArguments() const {

-    return !isArgNumeric;
+    return msgPattern.hasNamedArguments();

 }
 
 }
 

-UBool
-MessageFormat::isLegalArgName(const UnicodeString& argName) const {
-    if(!u_hasBinaryProperty(argName.charAt(0), idStart)) {
-        return FALSE;
+int32_t
+MessageFormat::getArgTypeCount() const {
+    return argTypeCount;
+}
+
+UBool MessageFormat::equalFormats(const void* left, const void* right) {
+    return *(const Format*)left==*(const Format*)right;
+}
+
+
+UBool MessageFormat::DummyFormat::operator==(const Format&) const {
+    return TRUE;
+}
+
+Format* MessageFormat::DummyFormat::clone() const {
+    return new DummyFormat();
+}
+
+UnicodeString& MessageFormat::DummyFormat::format(const Formattable&,
+                          UnicodeString& appendTo,
+                          UErrorCode& status) const {
+    if (U_SUCCESS(status)) {
+        status = U_UNSUPPORTED_ERROR;

     }
     }

-    for (int32_t i=1; i<argName.length(); ++i) {
-        if(!u_hasBinaryProperty(argName.charAt(i), idContinue)) {
-            return FALSE;
-        }
+    return appendTo;
+}
+
+UnicodeString& MessageFormat::DummyFormat::format(const Formattable&,
+                          UnicodeString& appendTo,
+                          FieldPosition&,
+                          UErrorCode& status) const {
+    if (U_SUCCESS(status)) {
+        status = U_UNSUPPORTED_ERROR;

     }
     }

-    return TRUE;
+    return appendTo;

 }
 
 }
 

-int32_t
-MessageFormat::getArgTypeCount() const {
-        return argTypeCount;
+UnicodeString& MessageFormat::DummyFormat::format(const Formattable&,
+                          UnicodeString& appendTo,
+                          FieldPositionIterator*,
+                          UErrorCode& status) const {
+    if (U_SUCCESS(status)) {
+        status = U_UNSUPPORTED_ERROR;
+    }
+    return appendTo;

 }
 
 }
 

+void MessageFormat::DummyFormat::parseObject(const UnicodeString&,
+                                                     Formattable&,
+                                                     ParsePosition& ) const {
+}
+
+

 FormatNameEnumeration::FormatNameEnumeration(UVector *fNameList, UErrorCode& /*status*/) {
     pos=0;
     fFormatNames = fNameList;
 FormatNameEnumeration::FormatNameEnumeration(UVector *fNameList, UErrorCode& /*status*/) {
     pos=0;
     fFormatNames = fNameList;


@@ -1839,18 +1908,71 @@ FormatNameEnumeration::reset(UErrorCode& /*status*/) {
 
 int32_t
 FormatNameEnumeration::count(UErrorCode& /*status*/) const {
 
 int32_t
 FormatNameEnumeration::count(UErrorCode& /*status*/) const {

-       return (fFormatNames==NULL) ? 0 : fFormatNames->size();
+    return (fFormatNames==NULL) ? 0 : fFormatNames->size();

 }
 
 FormatNameEnumeration::~FormatNameEnumeration() {
 }
 
 FormatNameEnumeration::~FormatNameEnumeration() {

-    UnicodeString *s;
-    for (int32_t i=0; i<fFormatNames->size(); ++i) {
-        if ((s=(UnicodeString *)fFormatNames->elementAt(i))!=NULL) {
-            delete s;
+    delete fFormatNames;
+}
+
+MessageFormat::PluralSelectorProvider::PluralSelectorProvider(const MessageFormat &mf, UPluralType t)
+        : msgFormat(mf), rules(NULL), type(t) {
+}
+
+MessageFormat::PluralSelectorProvider::~PluralSelectorProvider() {
+    delete rules;
+}
+
+UnicodeString MessageFormat::PluralSelectorProvider::select(void *ctx, double number,
+                                                            UErrorCode& ec) const {
+    if (U_FAILURE(ec)) {
+        return UnicodeString(FALSE, OTHER_STRING, 5);
+    }
+    MessageFormat::PluralSelectorProvider* t = const_cast<MessageFormat::PluralSelectorProvider*>(this);
+    if(rules == NULL) {
+        t->rules = PluralRules::forLocale(msgFormat.fLocale, type, ec);
+        if (U_FAILURE(ec)) {
+            return UnicodeString(FALSE, OTHER_STRING, 5);
+        }
+    }
+    // Select a sub-message according to how the number is formatted,
+    // which is specified in the selected sub-message.
+    // We avoid this circle by looking at how
+    // the number is formatted in the "other" sub-message
+    // which must always be present and usually contains the number.
+    // Message authors should be consistent across sub-messages.
+    PluralSelectorContext &context = *static_cast<PluralSelectorContext *>(ctx);
+    int32_t otherIndex = msgFormat.findOtherSubMessage(context.startIndex);
+    context.numberArgIndex = msgFormat.findFirstPluralNumberArg(otherIndex, context.argName);
+    if(context.numberArgIndex > 0 && msgFormat.cachedFormatters != NULL) {
+        context.formatter =
+            (const Format*)uhash_iget(msgFormat.cachedFormatters, context.numberArgIndex);
+    }
+    if(context.formatter == NULL) {
+        context.formatter = msgFormat.getDefaultNumberFormat(ec);
+        context.forReplaceNumber = TRUE;
+    }
+    U_ASSERT(context.number.getDouble(ec) == number);  // argument number minus the offset
+    context.formatter->format(context.number, context.numberString, ec);
+    const DecimalFormat *decFmt = dynamic_cast<const DecimalFormat *>(context.formatter);
+    if(decFmt != NULL) {
+        VisibleDigitsWithExponent digits;
+        decFmt->initVisibleDigitsWithExponent(context.number, digits, ec);
+        if (U_FAILURE(ec)) {
+            return UnicodeString(FALSE, OTHER_STRING, 5);

         }
         }

+        return rules->select(digits);
+    } else {
+        return rules->select(number);

     }
     }

-    delete fFormatNames;

 }
 }

+
+void MessageFormat::PluralSelectorProvider::reset() {
+    delete rules;
+    rules = NULL;
+}
+
+

 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */