ICU 56 step 4: Apply post-56 fixes for measure/date format

source/common/simplepatternformatter.h

 /*
 ******************************************************************************
-* Copyright (C) 2014, International Business Machines
+* Copyright (C) 2014-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 ******************************************************************************
 * simplepatternformatter.h
 */
 
 #ifndef __SIMPLEPATTERNFORMATTER_H__
 #define __SIMPLEPATTERNFORMATTER_H__ 
 
 #define EXPECTED_PLACEHOLDER_COUNT 3
 
@@ skipping 31 matching lines @@
  * </pre>
  */
 class U_COMMON_API SimplePatternFormatter : public UMemory {
 public:
     /**
      * Default constructor
      */
     SimplePatternFormatter();
 
     /**
-     * Construct from a pattern. Will never fail if pattern has three or
+     * Constructs from a pattern. Will never fail if pattern has three or
      * fewer placeholders in it.
      */
     explicit SimplePatternFormatter(const UnicodeString& pattern);
 
     /**
+     * Constructs from a pattern. Will never fail if pattern has three or
+     * fewer placeholders in it.
+     *
+     * @param min The pattern must have at least this many placeholders.
+     * @param max The pattern must have at most this many placeholders.
+     */
+    SimplePatternFormatter(const UnicodeString& pattern, int32_t min, int32_t max,
+                           UErrorCode &errorCode);
+
+    /**
      * Copy constructor.
      */
     SimplePatternFormatter(const SimplePatternFormatter& other);
 
     /**
      * Assignment operator
      */
     SimplePatternFormatter &operator=(const SimplePatternFormatter& other);
 
     /**
      * Destructor.
      */
     ~SimplePatternFormatter();
 
     /**
      * Compiles pattern and makes this object represent pattern.
      *
      * Returns TRUE on success; FALSE on failure. Will not fail if
      * there are three or fewer placeholders in pattern. May fail with
      * U_MEMORY_ALLOCATION_ERROR if there are more than three placeholders.
      */
-    UBool compile(const UnicodeString &pattern, UErrorCode &status);
+    UBool compile(const UnicodeString &pattern, UErrorCode &status) {
+        return compileMinMaxPlaceholders(pattern, 0, INT32_MAX, status);
+    }
+
+    /**
+     * Compiles pattern and makes this object represent pattern.
+     *
+     * Returns TRUE on success; FALSE on failure. Will not fail if
+     * there are three or fewer placeholders in pattern. May fail with
+     * U_MEMORY_ALLOCATION_ERROR if there are more than three placeholders.
+     *
+     * @param min The pattern must have at least this many placeholders.
+     * @param max The pattern must have at most this many placeholders.
+     */
+    UBool compileMinMaxPlaceholders(const UnicodeString &pattern,
+                                    int32_t min, int32_t max, UErrorCode &status);
 
     /**
      * Returns (maxPlaceholderId + 1). For example
      * <code>SimplePatternFormatter("{0} {2}").getPlaceholderCount()
      * evaluates to 3.
      * Callers use this function to find out how many values this object
      * expects when formatting.
      */
     int32_t getPlaceholderCount() const {
         return placeholderCount;
@@ skipping 136 matching lines @@
     int32_t ensureCapacity(int32_t desiredCapacity, int32_t allocationSize=0);
 
     // Records the offset of an individual placeholder in the noPlaceholders
     // string.
     UBool addPlaceholder(int32_t id, int32_t offset);
 };
 
 U_NAMESPACE_END
 
 #endif