ICU-64260.0.1.tar.gz

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

diff --git a/icuSources/i18n/uatimeunitformat.cpp b/icuSources/i18n/uatimeunitformat.cpp
index f8c40b9adb3791334f8efe72fc02f6f8be876568..37cb849e4d335c872ba3be29873f246a978a70ca 100644 (file)
--- a/icuSources/i18n/uatimeunitformat.cpp
+++ b/icuSources/i18n/uatimeunitformat.cpp
@@ -18,6 +18,7 @@
 #include "unicode/unistr.h"
 #include "unicode/unum.h"
 #include "unicode/ures.h"
 #include "unicode/unistr.h"
 #include "unicode/unum.h"
 #include "unicode/ures.h"

+#include "unicode/ustring.h"

 #include "ureslocs.h"
 #include "uresimp.h"
 #include "ustr_imp.h"
 #include "ureslocs.h"
 #include "uresimp.h"
 #include "ustr_imp.h"


@@ -51,6 +52,8 @@ uatmufmt_openWithNumberFormat(const char*  locale,
             mfWidth = UMEASFMT_WIDTH_SHORT; break;
         case UATIMEUNITSTYLE_NARROW:
             mfWidth = UMEASFMT_WIDTH_NARROW; break;
             mfWidth = UMEASFMT_WIDTH_SHORT; break;
         case UATIMEUNITSTYLE_NARROW:
             mfWidth = UMEASFMT_WIDTH_NARROW; break;

+        case UATIMEUNITSTYLE_SHORTER:
+            mfWidth = UMEASFMT_WIDTH_SHORTER; break;

         default:
             *status = U_ILLEGAL_ARGUMENT_ERROR; return NULL;
     }
         default:
             *status = U_ILLEGAL_ARGUMENT_ERROR; return NULL;
     }


@@ -105,6 +108,9 @@ uatmufmt_format(const UATimeUnitFormat* mfmt,
         case UATIMEUNITFIELD_HOUR:    munit = MeasureUnit::createHour(*status);    break;
         case UATIMEUNITFIELD_MINUTE:  munit = MeasureUnit::createMinute(*status);  break;
         case UATIMEUNITFIELD_SECOND:  munit = MeasureUnit::createSecond(*status);  break;
         case UATIMEUNITFIELD_HOUR:    munit = MeasureUnit::createHour(*status);    break;
         case UATIMEUNITFIELD_MINUTE:  munit = MeasureUnit::createMinute(*status);  break;
         case UATIMEUNITFIELD_SECOND:  munit = MeasureUnit::createSecond(*status);  break;

+        case UATIMEUNITFIELD_MILLISECOND: munit = MeasureUnit::createMillisecond(*status); break;
+        case UATIMEUNITFIELD_MICROSECOND: munit = MeasureUnit::createMicrosecond(*status); break;
+        case UATIMEUNITFIELD_NANOSECOND:  munit = MeasureUnit::createNanosecond(*status);  break;

         default: *status = U_ILLEGAL_ARGUMENT_ERROR; break;
     }
     if (U_FAILURE(*status)) {
         default: *status = U_ILLEGAL_ARGUMENT_ERROR; break;
     }
     if (U_FAILURE(*status)) {


@@ -125,19 +131,17 @@ uatmufmt_format(const UATimeUnitFormat* mfmt,
 
 
 U_CAPI double U_EXPORT2
 
 
 U_CAPI double U_EXPORT2

-uatmufmt_parse( const UATimeUnitFormat* mfmt,
-                const UChar*    text,
-                int32_t         textLength,
-                int32_t*        parsePos,
-                UATimeUnitField* field,
+uatmufmt_parse( const UATimeUnitFormat*,
+                const UChar*,
+                int32_t,
+                int32_t*,
+                UATimeUnitField*,

                 UErrorCode*     status)
 {
                 UErrorCode*     status)
 {

-    double doubleVal = 0.0;
-    if (U_FAILURE(*status)) {
-        return doubleVal;
+    if (!U_FAILURE(*status)) {
+        *status = U_UNSUPPORTED_ERROR;

     }
     }

-    *status = U_UNSUPPORTED_ERROR;
-    return doubleVal;
+    return 0.0;

 }
 
 
 }
 
 


@@ -195,6 +199,7 @@ uatmufmt_getListPattern(const char*     locale,
         case UATIMEUNITSTYLE_FULL:          { styleKey = "unit"; break; }
         case UATIMEUNITSTYLE_ABBREVIATED:   { styleKey = "unit-short"; break; }
         case UATIMEUNITSTYLE_NARROW:        { styleKey = "unit-narrow"; break; }
         case UATIMEUNITSTYLE_FULL:          { styleKey = "unit"; break; }
         case UATIMEUNITSTYLE_ABBREVIATED:   { styleKey = "unit-short"; break; }
         case UATIMEUNITSTYLE_NARROW:        { styleKey = "unit-narrow"; break; }

+        case UATIMEUNITSTYLE_SHORTER:       { styleKey = "unit-narrow"; break; }

         default: { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; }
     }
     const char* typeKey = NULL;
         default: { *status = U_ILLEGAL_ARGUMENT_ERROR; return 0; }
     }
     const char* typeKey = NULL;