ICU-64260.0.1.tar.gz

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

diff --git a/icuSources/i18n/dtitvinf.cpp b/icuSources/i18n/dtitvinf.cpp
index c863a683a5c2f8d0475e6071df3cc0ea67cab6f3..c0a6980e5567bcd1d41e6906f34accfe666afc36 100644 (file)
--- a/icuSources/i18n/dtitvinf.cpp
+++ b/icuSources/i18n/dtitvinf.cpp
@@ -326,7 +326,9 @@ struct DateIntervalInfo::DateIntervalSink : public ResourceSink {
         char c0;
         if ((c0 = patternLetter[0]) != 0 && patternLetter[1] == 0) {
             // Check that the pattern letter is accepted
         char c0;
         if ((c0 = patternLetter[0]) != 0 && patternLetter[1] == 0) {
             // Check that the pattern letter is accepted

-            if (c0 == 'y') {
+            if (c0 == 'G') {
+                return UCAL_ERA;
+            } else if (c0 == 'y') {

                 return UCAL_YEAR;
             } else if (c0 == 'M') {
                 return UCAL_MONTH;
                 return UCAL_YEAR;
             } else if (c0 == 'M') {
                 return UCAL_MONTH;


@@ -594,7 +596,7 @@ DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton,
     const UHashElement* elem = NULL;
     while ( (elem = fIntervalPatterns->nextElement(pos)) != NULL ) {
         const UHashTok keyTok = elem->key;
     const UHashElement* elem = NULL;
     while ( (elem = fIntervalPatterns->nextElement(pos)) != NULL ) {
         const UHashTok keyTok = elem->key;

-        UnicodeString* skeleton = (UnicodeString*)keyTok.pointer;
+        UnicodeString* newSkeleton = (UnicodeString*)keyTok.pointer;

 #ifdef DTITVINF_DEBUG
     skeleton->extract(0,  skeleton->length(), result, "UTF-8");
     sprintf(mesg, "available skeletons: skeleton: %s; \n", result);
 #ifdef DTITVINF_DEBUG
     skeleton->extract(0,  skeleton->length(), result, "UTF-8");
     sprintf(mesg, "available skeletons: skeleton: %s; \n", result);


@@ -606,7 +608,7 @@ DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton,
         for ( i = 0; i < fieldLength; ++i ) {
             skeletonFieldWidth[i] = 0;
         }
         for ( i = 0; i < fieldLength; ++i ) {
             skeletonFieldWidth[i] = 0;
         }

-        parseSkeleton(*skeleton, skeletonFieldWidth);
+        parseSkeleton(*newSkeleton, skeletonFieldWidth);

         // calculate distance
         int32_t distance = 0;
         int8_t fieldDifference = 1;
         // calculate distance
         int32_t distance = 0;
         int8_t fieldDifference = 1;


@@ -632,7 +634,7 @@ DateIntervalInfo::getBestSkeleton(const UnicodeString& skeleton,
             }
         }
         if ( distance < bestDistance ) {
             }
         }
         if ( distance < bestDistance ) {

-            bestSkeleton = skeleton;
+            bestSkeleton = newSkeleton;

             bestDistance = distance;
             bestMatchDistanceInfo = fieldDifference;
         }
             bestDistance = distance;
             bestMatchDistanceInfo = fieldDifference;
         }