ICU-5787 code cleanup.

X-SVN-Rev: 22485

icu4c/source/i18n/dtptngen.cpp

@@ -123,12 +123,15 @@ static const char* Resource_Fields[] = {
 static const UChar UDATPG_ItemFormat[]= {0x7B, 0x30, 0x7D, 0x20, 0x251C, 0x7B, 0x32, 0x7D, 0x3A,
     0x20, 0x7B, 0x31, 0x7D, 0x2524, 0};  // {0} \u251C{2}: {1}\u2524
 
+static const UChar repeatedPatterns[6]={CAP_G, CAP_E, LOW_Z, LOW_V, CAP_Q, 0}; // "GEzvQ"
+
 static const char DT_DateTimePatternsTag[]="DateTimePatterns";
 static const char DT_DateTimeCalendarTag[]="calendar";
 static const char DT_DateTimeGregorianTag[]="gregorian";
 static const char DT_DateTimeAppendItemsTag[]="appendItems";
 static const char DT_DateTimeFieldsTag[]="fields";
 static const char DT_DateTimeAvailableFormatsTag[]="availableFormats";
+static const UnicodeString repeatedPattern=UnicodeString(repeatedPatterns);
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DateTimePatternGenerator)
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DTSkeletonEnumeration)
@@ -303,7 +306,7 @@ DateTimePatternGenerator::addICUPatterns(const Locale& locale, UErrorCode& statu
 }
 
 void
-DateTimePatternGenerator::hackTimes(UnicodeString& hackPattern, UErrorCode& status)  {
+DateTimePatternGenerator::hackTimes(const UnicodeString& hackPattern, UErrorCode& status)  {
     UDateTimePatternConflict conflictingStatus;
     UnicodeString conflictingString;
     
@@ -702,7 +705,7 @@ DateTimePatternGenerator::addPattern(
 
 
 UDateTimePatternField
-DateTimePatternGenerator::getAppendFormatNumber(const char* field) {
+DateTimePatternGenerator::getAppendFormatNumber(const char* field) const {
     for (int32_t i=0; i<UDATPG_FIELD_COUNT; ++i ) {
         if (uprv_strcmp(CLDR_FIELD_APPEND[i], field)==0) {
             return (UDateTimePatternField)i;
@@ -712,7 +715,7 @@ DateTimePatternGenerator::getAppendFormatNumber(const char* field) {
 }
 
 UDateTimePatternField
-DateTimePatternGenerator::getAppendNameNumber(const char* field) {
+DateTimePatternGenerator::getAppendNameNumber(const char* field) const {
     for (int32_t i=0; i<UDATPG_FIELD_COUNT; ++i ) {
         if (uprv_strcmp(CLDR_FIELD_NAME[i],field)==0) {
             return (UDateTimePatternField)i;
@@ -881,7 +884,7 @@ DateTimePatternGenerator::setAvailableFormat(const UnicodeString &key, UErrorCod
 }
 
 UBool
-DateTimePatternGenerator::isAvailableFormatSet(const UnicodeString &key) {
+DateTimePatternGenerator::isAvailableFormatSet(const UnicodeString &key) const {
     return (UBool)(fAvailableFormatKeyHash->geti(key) == 1);
 }
 
@@ -966,7 +969,7 @@ DateTimePatternGenerator::getRedundants(UErrorCode& status) {
 }
 
 UBool
-DateTimePatternGenerator::isCanonicalItem(const UnicodeString& item) {
+DateTimePatternGenerator::isCanonicalItem(const UnicodeString& item) const {
     if ( item.length() != 1 ) {
         return FALSE;
     }
@@ -1080,31 +1083,12 @@ PatternMap::add(const UnicodeString& basePattern,
             return;
         }
         if (baseChar >= LOW_A) {
-            Mutex mutex;
+            boot[26 + (baseChar-LOW_A)] = curElem;
-            if ( boot[26 + (baseChar-LOW_A)]==NULL ) {
-                boot[26 + (baseChar-LOW_A)] = curElem;
-            }
-            else {
-                uprv_free(curElem);
-                curElem=NULL;
-                baseElem = boot[26 + (baseChar-LOW_A)];
-            }
         }
         else {
-            Mutex mutex;
+            boot[baseChar-CAP_A] = curElem;
-            if (boot[baseChar-CAP_A] == NULL ) {
-                boot[baseChar-CAP_A] = curElem;
-            }
-            else {
-                uprv_free(curElem);
-                curElem=NULL;
-                baseElem = boot[baseChar-CAP_A];
-            }
-        }
-        if ( curElem != NULL ) {
-            curElem->skeleton = new PtnSkeleton(skeleton);
-            curElem->next = NULL;
         }
+        curElem->skeleton = new PtnSkeleton(skeleton);
     }
     if ( baseElem != NULL ) {
         curElem = getDuplicateElem(basePattern, skeleton, baseElem);
@@ -1112,21 +1096,17 @@ PatternMap::add(const UnicodeString& basePattern,
         if (curElem == NULL) {
             // add new element to the list.
             curElem = baseElem;
+            while( curElem -> next != NULL )
             {
-                Mutex mutex;
+                curElem = curElem->next;
-                while( curElem -> next != NULL )
-                {
-                    curElem = curElem->next;
-                }
-                if ((curElem->next = new PtnElem(basePattern, value)) == NULL ) {
-                    // out of memory
-                    status = U_MEMORY_ALLOCATION_ERROR;
-                    return;
-                }
-                curElem=curElem->next;
             }
+            if ((curElem->next = new PtnElem(basePattern, value)) == NULL ) {
+                // out of memory
+                status = U_MEMORY_ALLOCATION_ERROR;
+                return;
+            }
+            curElem=curElem->next;
             curElem->skeleton = new PtnSkeleton(skeleton);
-            curElem->next = NULL;
         }
         else {
             // Pattern exists in the list already.
@@ -1278,10 +1258,6 @@ DateTimeMatcher::set(const UnicodeString& pattern, FormatParser* fp) {
 
 void
 DateTimeMatcher::set(const UnicodeString& pattern, FormatParser* fp, PtnSkeleton& skeleton) {
-
-    static const UChar repeatedPatterns[6]={CAP_G, CAP_E, LOW_Z, LOW_V, CAP_Q, 0}; // "GEzvQ"
-    UnicodeString repeatedPattern=UnicodeString(repeatedPatterns);
-
     for (int32_t i=0; i<UDATPG_FIELD_COUNT; ++i) {
         skeleton.type[i]=NONE;
     }
@@ -1315,11 +1291,7 @@ DateTimeMatcher::set(const UnicodeString& pattern, FormatParser* fp, PtnSkeleton
         }
         skeleton.type[typeValue] = (int8_t)subTypeValue;
     }
-    {
+    copyFrom(skeleton);
-        Mutex mutex;
-        copyFrom(skeleton);
-    }
-
     return;
 }
 
@@ -1347,7 +1319,7 @@ DateTimeMatcher::getPattern() {
 }
 
 int32_t
-DateTimeMatcher::getDistance(DateTimeMatcher& other, int32_t includeMask, DistanceInfo& distanceInfo) {
+DateTimeMatcher::getDistance(const DateTimeMatcher& other, int32_t includeMask, DistanceInfo& distanceInfo) {
     int32_t result=0;
     distanceInfo.clear();
     for (int32_t i=0; i<UDATPG_FIELD_COUNT; ++i ) {
@@ -1396,7 +1368,7 @@ DateTimeMatcher::copyFrom() {
 }
 
 UBool
-DateTimeMatcher::equals(DateTimeMatcher* other) {
+DateTimeMatcher::equals(const DateTimeMatcher* other) const {
     if (other==NULL) {
         return FALSE;
     }
@@ -1507,7 +1479,7 @@ FormatParser::getCanonicalIndex(const UnicodeString& s) {
 }
 
 UBool
-FormatParser::isQuoteLiteral(UnicodeString s) {
+FormatParser::isQuoteLiteral(const UnicodeString& s) const {
     return (UBool)(s.charAt(0)==SINGLE_QUOTE);
 }
 
@@ -1517,6 +1489,7 @@ void
 FormatParser::getQuoteLiteral(UnicodeString& quote, int32_t *itemIndex) {
     int32_t i=*itemIndex;
     
+    quote.remove();
     if (items[i].charAt(0)==SINGLE_QUOTE) {
         quote += items[i];
         ++i;
@@ -1525,7 +1498,8 @@ FormatParser::getQuoteLiteral(UnicodeString& quote, int32_t *itemIndex) {
         if ( items[i].charAt(0)==SINGLE_QUOTE ) {
             if ( (i+1<itemNumber) && (items[i+1].charAt(0)==SINGLE_QUOTE)) {
                 // two single quotes e.g. 'o''clock'
-                quote += items[++i];
+                quote += items[i++];
+                quote += items[i++];
                 continue;
             }
             else {
@@ -1710,10 +1684,10 @@ PtnSkeleton::~PtnSkeleton() {
 
 PtnElem::PtnElem(const UnicodeString &basePat, const UnicodeString &pat) : 
 basePattern(basePat),
-pattern(pat)
+pattern(pat),
+skeleton(NULL),
+next(NULL)
 {
-    skeleton=NULL;
-    next=NULL;
 }
 
 PtnElem::~PtnElem() {

icu4c/source/i18n/dtptngen_impl.h

@@ -137,31 +137,8 @@ public:
 
     FormatParser();
     virtual ~FormatParser();
-    /**
-     * Set the string to parse
-     * @param string
-     * @return this, for chaining
-     * @deprecated
-     * @internal
-     */
     void set(const UnicodeString& patternString);
-    /**
+    UBool isQuoteLiteral(const UnicodeString& s) const;
-     * Check string 's' is a quoted literal
-     * @param string with quoted literals
-     * @param starting index of items and return the next index of items of end quoted literal
-     * @return TRUE if s is a quote literal, FALSE if s is not a quote literal.
-     * @deprecated
-     * @internal
-     */
-    UBool isQuoteLiteral(UnicodeString s);
-    /**
-     *  produce a quoted literal
-     * @param string with quoted literals
-     * @param starting index of items and return the next index of items of end quoted literal
-     * @return none
-     * @deprecated
-     * @internal
-     */
     void getQuoteLiteral(UnicodeString& quote, int32_t *itemIndex);
     int32_t getCanonicalIndex(const UnicodeString& s);
     UBool isPatternSeparator(UnicodeString& field);
@@ -176,12 +153,9 @@ private:
    } ToeknStatus;
 
    TokenStatus status;
-   UnicodeSet *quoteFilter;
-
    virtual TokenStatus setTokens(const UnicodeString& pattern, int32_t startPos, int32_t *len);
 };
 
-
 class DistanceInfo : public UMemory {
 public:
     int32_t missingFieldMask;
@@ -206,8 +180,8 @@ public:
     void copyFrom(PtnSkeleton& skeleton);
     void copyFrom();
     PtnSkeleton* getSkeletonPtr();
-    UBool equals(DateTimeMatcher* other);
+    UBool equals(const DateTimeMatcher* other) const;
-    int32_t getDistance(DateTimeMatcher& other, int32_t includeMask, DistanceInfo& distanceInfo);
+    int32_t getDistance(const DateTimeMatcher& other, int32_t includeMask, DistanceInfo& distanceInfo);
     DateTimeMatcher();
     virtual ~DateTimeMatcher() {};
     int32_t getFieldMask();

icu4c/source/i18n/unicode/dtptngen.h

@@ -59,7 +59,7 @@ public:
     static DateTimePatternGenerator* U_EXPORT2 createInstance(const Locale& uLocale, UErrorCode& status);
 
     /**
-     * Create an empty generator, to be constructed with add(...) etc.
+     * Create an empty generator, to be constructed with addPattern(...) etc.
      * @param status  Output param set to success/failure code on exit,
      *               which must not indicate a failure before the function call.
      * @draft ICU 3.8
@@ -390,24 +390,24 @@ private:
     void initData(const Locale &locale);
     void addCanonicalItems();
     void addICUPatterns(const Locale& locale, UErrorCode& status);
-    void hackTimes(UnicodeString& hackPattern, UErrorCode& status);
+    void hackTimes(const UnicodeString& hackPattern, UErrorCode& status);
     void addCLDRData(const Locale& locale);
     void initHashtable(UErrorCode& status);
     void setDateTimeFromCalendar(const Locale& locale, UErrorCode& status);
     void setDecimalSymbols(const Locale& locale, UErrorCode& status);
-    UDateTimePatternField getAppendFormatNumber(const char* field);
+    UDateTimePatternField getAppendFormatNumber(const char* field) const;
-    UDateTimePatternField getAppendNameNumber(const char* field);
+    UDateTimePatternField getAppendNameNumber(const char* field) const;
     void getAppendName(UDateTimePatternField field, UnicodeString& value);
     int32_t getCanonicalIndex(const UnicodeString& field);
     const UnicodeString* getBestRaw(DateTimeMatcher& source, int32_t includeMask, DistanceInfo* missingFields);
     UnicodeString adjustFieldTypes(const UnicodeString& pattern, UBool fixFractionalSeconds);
-    UnicodeString getBestAppending(const int32_t missingFields);
+    UnicodeString getBestAppending(int32_t missingFields);
     int32_t getTopBitNumber(int32_t foundMask);
     void setAvailableFormat(const UnicodeString &key, UErrorCode& status);
-    UBool isAvailableFormatSet(const UnicodeString &key);
+    UBool isAvailableFormatSet(const UnicodeString &key) const;
     void copyHashtable(Hashtable *other);
-    UBool isCanonicalItem(const UnicodeString& item);
+    UBool isCanonicalItem(const UnicodeString& item) const;
-    UErrorCode getStatus() {  return fStatus; } ;
+    UErrorCode getStatus() const {  return fStatus; } ;
 } ;// end class DateTimePatternGenerator
 
 U_NAMESPACE_END