]> git.saurik.com Git - apple/icu.git/blobdiff - icuSources/i18n/ucal.cpp
ICU-461.12.tar.gz
[apple/icu.git] / icuSources / i18n / ucal.cpp
index 636adf4cd74794c69664d261bc6e21b5a0787a9c..cb060ab28aec6cc2ebe3a116256066cba036a7cf 100644 (file)
@@ -1,10 +1,12 @@
 /*
 *******************************************************************************
 /*
 *******************************************************************************
-*   Copyright (C) 1996-2006, International Business Machines
+*   Copyright (C) 1996-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 */
 
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 */
 
+#include <typeinfo>  // for 'typeid' to work
+
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 #include "unicode/ustring.h"
 #include "unicode/strenum.h"
 #include "cmemory.h"
 #include "unicode/ustring.h"
 #include "unicode/strenum.h"
 #include "cmemory.h"
+#include "cstring.h"
 #include "ustrenum.h"
 #include "ustrenum.h"
+#include "uenumimp.h"
+#include "ulist.h"
 
 U_NAMESPACE_USE
 
 
 U_NAMESPACE_USE
 
@@ -42,12 +47,12 @@ _createTimeZone(const UChar* zoneID, int32_t len, UErrorCode* ec) {
 
 U_CAPI UEnumeration* U_EXPORT2
 ucal_openTimeZones(UErrorCode* ec) {
 
 U_CAPI UEnumeration* U_EXPORT2
 ucal_openTimeZones(UErrorCode* ec) {
-    return uenum_openStringEnumeration(TimeZone::createEnumeration(), ec);
+    return uenum_openFromStringEnumeration(TimeZone::createEnumeration(), ec);
 }
 
 U_CAPI UEnumeration* U_EXPORT2
 ucal_openCountryTimeZones(const char* country, UErrorCode* ec) {
 }
 
 U_CAPI UEnumeration* U_EXPORT2
 ucal_openCountryTimeZones(const char* country, UErrorCode* ec) {
-    return uenum_openStringEnumeration(TimeZone::createEnumeration(country), ec);
+    return uenum_openFromStringEnumeration(TimeZone::createEnumeration(country), ec);
 }
 
 U_CAPI int32_t U_EXPORT2
 }
 
 U_CAPI int32_t U_EXPORT2
@@ -80,8 +85,9 @@ ucal_getDSTSavings(const UChar* zoneID, UErrorCode* ec) {
     int32_t result = 0;
     TimeZone* zone = _createTimeZone(zoneID, -1, ec);
     if (U_SUCCESS(*ec)) {
     int32_t result = 0;
     TimeZone* zone = _createTimeZone(zoneID, -1, ec);
     if (U_SUCCESS(*ec)) {
-        if (zone->getDynamicClassID() == SimpleTimeZone::getStaticClassID()) {
-            result = ((SimpleTimeZone*) zone)->getDSTSavings();
+        SimpleTimeZone* stz = dynamic_cast<SimpleTimeZone*>(zone);
+        if (stz != NULL) {
+            result = stz->getDSTSavings();
         } else {
             // Since there is no getDSTSavings on TimeZone, we use a
             // heuristic: Starting with the current time, march
         } else {
             // Since there is no getDSTSavings on TimeZone, we use a
             // heuristic: Starting with the current time, march
@@ -104,54 +110,6 @@ ucal_getDSTSavings(const UChar* zoneID, UErrorCode* ec) {
     return result;
 }
 
     return result;
 }
 
-#ifdef U_USE_UCAL_OBSOLETE_2_8
-U_CAPI const UChar* U_EXPORT2
-ucal_getAvailableTZIDs(        int32_t         rawOffset,
-                int32_t         index,
-                UErrorCode*     status)
-{
-
-  if(U_FAILURE(*status)) return 0;
-  
-  int32_t count = 0;
-  const UChar *retVal = 0;
-  
-  const UnicodeString** tzs = TimeZone::createAvailableIDs(rawOffset, 
-                                 count);
-
-  if(tzs == 0) {
-    *status = U_MEMORY_ALLOCATION_ERROR;
-    return 0;
-  }
-
-  if(index < count)
-    retVal = tzs[index]->getBuffer();
-  else
-    *status = U_INDEX_OUTOFBOUNDS_ERROR;
-  
-  uprv_free(tzs);
-  return retVal;
-}
-
-U_CAPI int32_t U_EXPORT2
-ucal_countAvailableTZIDs(int32_t rawOffset)
-{  
-
-  int32_t count = 0;
-  
-  const UnicodeString** tzs = TimeZone::createAvailableIDs(rawOffset, 
-                                  count);
-
-  if(tzs == 0) {
-    // TBD: U_MEMORY_ALLOCATION_ERROR
-    return 0;
-  }
-
-  uprv_free(tzs);
-  return count;
-}
-#endif
-
 U_CAPI UDate  U_EXPORT2
 ucal_getNow()
 {
 U_CAPI UDate  U_EXPORT2
 ucal_getNow()
 {
@@ -159,13 +117,14 @@ ucal_getNow()
   return Calendar::getNow();
 }
 
   return Calendar::getNow();
 }
 
-// ignore type until we add more subclasses
+#define ULOC_LOCALE_IDENTIFIER_CAPACITY (ULOC_FULLNAME_CAPACITY + 1 + ULOC_KEYWORD_AND_VALUES_CAPACITY)
+
 U_CAPI UCalendar*  U_EXPORT2
 U_CAPI UCalendar*  U_EXPORT2
-ucal_open(    const    UChar*          zoneID,
-            int32_t        len,
-        const    char*       locale,
-            UCalendarType     /*type*/,
-            UErrorCode*    status)
+ucal_open(  const UChar*  zoneID,
+            int32_t       len,
+            const char*   locale,
+            UCalendarType caltype,
+            UErrorCode*   status)
 {
 
   if(U_FAILURE(*status)) return 0;
 {
 
   if(U_FAILURE(*status)) return 0;
@@ -176,7 +135,19 @@ ucal_open(    const    UChar*          zoneID,
   if (U_FAILURE(*status)) {
       return NULL;
   }
   if (U_FAILURE(*status)) {
       return NULL;
   }
-  
+
+  if ( caltype == UCAL_GREGORIAN ) {
+      char  localeBuf[ULOC_LOCALE_IDENTIFIER_CAPACITY];
+      if ( locale == NULL ) {
+          locale = uloc_getDefault();
+      }
+      uprv_strncpy(localeBuf, locale, ULOC_LOCALE_IDENTIFIER_CAPACITY);
+      uloc_setKeywordValue("calendar", "gregorian", localeBuf, ULOC_LOCALE_IDENTIFIER_CAPACITY, status);
+      if (U_FAILURE(*status)) {
+          return NULL;
+      }
+      return (UCalendar*)Calendar::createInstance(zone, Locale(localeBuf), *status);
+  }
   return (UCalendar*)Calendar::createInstance(zone, Locale(locale), *status);
 }
 
   return (UCalendar*)Calendar::createInstance(zone, Locale(locale), *status);
 }
 
@@ -187,6 +158,22 @@ ucal_close(UCalendar *cal)
   delete (Calendar*) cal;
 }
 
   delete (Calendar*) cal;
 }
 
+U_CAPI UCalendar* U_EXPORT2 
+ucal_clone(const UCalendar* cal,
+           UErrorCode*      status)
+{
+  if(U_FAILURE(*status)) return 0;
+  
+  Calendar* res = ((Calendar*)cal)->clone();
+
+  if(res == 0) {
+    *status = U_MEMORY_ALLOCATION_ERROR;
+    return 0;
+  }
+
+  return (UCalendar*) res;
+}
+
 U_CAPI void  U_EXPORT2
 ucal_setTimeZone(    UCalendar*      cal,
             const    UChar*            zoneID,
 U_CAPI void  U_EXPORT2
 ucal_setTimeZone(    UCalendar*      cal,
             const    UChar*            zoneID,
@@ -214,289 +201,296 @@ ucal_getTimeZoneDisplayName(const     UCalendar*                 cal,
                     UErrorCode*             status)
 {
 
                     UErrorCode*             status)
 {
 
-  if(U_FAILURE(*status)) return -1;
+    if(U_FAILURE(*status)) return -1;
 
 
-  const TimeZone& tz = ((Calendar*)cal)->getTimeZone();
-  UnicodeString id;
-  if(!(result==NULL && resultLength==0)) {
-    // NULL destination for pure preflighting: empty dummy string
-    // otherwise, alias the destination buffer
-    id.setTo(result, 0, resultLength);
-  }
+    const TimeZone& tz = ((Calendar*)cal)->getTimeZone();
+    UnicodeString id;
+    if(!(result==NULL && resultLength==0)) {
+        // NULL destination for pure preflighting: empty dummy string
+        // otherwise, alias the destination buffer
+        id.setTo(result, 0, resultLength);
+    }
 
 
-  switch(type) {
+    switch(type) {
   case UCAL_STANDARD:
   case UCAL_STANDARD:
-    tz.getDisplayName(FALSE, TimeZone::LONG, Locale(locale), id);
-    break;
+      tz.getDisplayName(FALSE, TimeZone::LONG, Locale(locale), id);
+      break;
 
   case UCAL_SHORT_STANDARD:
 
   case UCAL_SHORT_STANDARD:
-    tz.getDisplayName(FALSE, TimeZone::SHORT, Locale(locale), id);
-    break;
+      tz.getDisplayName(FALSE, TimeZone::SHORT, Locale(locale), id);
+      break;
 
   case UCAL_DST:
 
   case UCAL_DST:
-    tz.getDisplayName(TRUE, TimeZone::LONG, Locale(locale), id);
-    break;
+      tz.getDisplayName(TRUE, TimeZone::LONG, Locale(locale), id);
+      break;
 
   case UCAL_SHORT_DST:
 
   case UCAL_SHORT_DST:
-    tz.getDisplayName(TRUE, TimeZone::SHORT, Locale(locale), id);
-    break;
-  }
+      tz.getDisplayName(TRUE, TimeZone::SHORT, Locale(locale), id);
+      break;
+    }
 
 
-  return id.extract(result, resultLength, *status);
+    return id.extract(result, resultLength, *status);
 }
 
 U_CAPI UBool  U_EXPORT2
 ucal_inDaylightTime(    const    UCalendar*      cal, 
 }
 
 U_CAPI UBool  U_EXPORT2
 ucal_inDaylightTime(    const    UCalendar*      cal, 
-            UErrorCode*     status )
+                    UErrorCode*     status )
 {
 
 {
 
-  if(U_FAILURE(*status)) return (UBool) -1;
-  return ((Calendar*)cal)->inDaylightTime(*status);
+    if(U_FAILURE(*status)) return (UBool) -1;
+    return ((Calendar*)cal)->inDaylightTime(*status);
 }
 
 }
 
-U_DRAFT void U_EXPORT2
+U_CAPI void U_EXPORT2
 ucal_setGregorianChange(UCalendar *cal, UDate date, UErrorCode *pErrorCode) {
 ucal_setGregorianChange(UCalendar *cal, UDate date, UErrorCode *pErrorCode) {
-  if(U_FAILURE(*pErrorCode)) {
-    return;
-  }
-  Calendar *cpp_cal = (Calendar *)cal;
-  if(cpp_cal->getDynamicClassID() != GregorianCalendar::getStaticClassID()) {
-    *pErrorCode = U_UNSUPPORTED_ERROR;
-    return;
-  }
-  ((GregorianCalendar *)cpp_cal)->setGregorianChange(date, *pErrorCode);
+    if(U_FAILURE(*pErrorCode)) {
+        return;
+    }
+    Calendar *cpp_cal = (Calendar *)cal;
+    GregorianCalendar *gregocal = dynamic_cast<GregorianCalendar *>(cpp_cal);
+    // Not if(gregocal == NULL) {
+    // because we really want to work only with a GregorianCalendar, not with
+    // its subclasses like BuddhistCalendar.
+    if(typeid(*cpp_cal) != typeid(GregorianCalendar)) {
+        *pErrorCode = U_UNSUPPORTED_ERROR;
+        return;
+    }
+    gregocal->setGregorianChange(date, *pErrorCode);
 }
 
 }
 
-U_DRAFT UDate U_EXPORT2
+U_CAPI UDate U_EXPORT2
 ucal_getGregorianChange(const UCalendar *cal, UErrorCode *pErrorCode) {
 ucal_getGregorianChange(const UCalendar *cal, UErrorCode *pErrorCode) {
-  if(U_FAILURE(*pErrorCode)) {
-    return (UDate)0;
-  }
-  Calendar *cpp_cal = (Calendar *)cal;
-  if(cpp_cal->getDynamicClassID() != GregorianCalendar::getStaticClassID()) {
-    *pErrorCode = U_UNSUPPORTED_ERROR;
-    return (UDate)0;
-  }
-  return ((GregorianCalendar *)cpp_cal)->getGregorianChange();
+    if(U_FAILURE(*pErrorCode)) {
+        return (UDate)0;
+    }
+    const Calendar *cpp_cal = (const Calendar *)cal;
+    const GregorianCalendar *gregocal = dynamic_cast<const GregorianCalendar *>(cpp_cal);
+    // Not if(gregocal == NULL) {
+    // see comments in ucal_setGregorianChange().
+    if(typeid(*cpp_cal) != typeid(GregorianCalendar)) {
+        *pErrorCode = U_UNSUPPORTED_ERROR;
+        return (UDate)0;
+    }
+    return gregocal->getGregorianChange();
 }
 
 U_CAPI int32_t U_EXPORT2
 ucal_getAttribute(    const    UCalendar*              cal,
 }
 
 U_CAPI int32_t U_EXPORT2
 ucal_getAttribute(    const    UCalendar*              cal,
-            UCalendarAttribute      attr)
+                  UCalendarAttribute      attr)
 {
 
 {
 
-  switch(attr) {
+    switch(attr) {
   case UCAL_LENIENT:
   case UCAL_LENIENT:
-    return ((Calendar*)cal)->isLenient();
-    
+      return ((Calendar*)cal)->isLenient();
+
   case UCAL_FIRST_DAY_OF_WEEK:
   case UCAL_FIRST_DAY_OF_WEEK:
-    return ((Calendar*)cal)->getFirstDayOfWeek();
-      
+      return ((Calendar*)cal)->getFirstDayOfWeek();
+
   case UCAL_MINIMAL_DAYS_IN_FIRST_WEEK:
   case UCAL_MINIMAL_DAYS_IN_FIRST_WEEK:
-    return ((Calendar*)cal)->getMinimalDaysInFirstWeek();
+      return ((Calendar*)cal)->getMinimalDaysInFirstWeek();
 
   default:
 
   default:
-    break;
-  }
-  return -1;
+      break;
+    }
+    return -1;
 }
 
 U_CAPI void U_EXPORT2
 ucal_setAttribute(      UCalendar*              cal,
 }
 
 U_CAPI void U_EXPORT2
 ucal_setAttribute(      UCalendar*              cal,
-            UCalendarAttribute      attr,
-            int32_t                 newValue)
+                  UCalendarAttribute      attr,
+                  int32_t                 newValue)
 {
 
 {
 
-  switch(attr) {
+    switch(attr) {
   case UCAL_LENIENT:
   case UCAL_LENIENT:
-    ((Calendar*)cal)->setLenient((UBool)newValue);
-    break;
-    
+      ((Calendar*)cal)->setLenient((UBool)newValue);
+      break;
+
   case UCAL_FIRST_DAY_OF_WEEK:
   case UCAL_FIRST_DAY_OF_WEEK:
-    ((Calendar*)cal)->setFirstDayOfWeek((UCalendarDaysOfWeek)newValue);
-    break;
-      
+      ((Calendar*)cal)->setFirstDayOfWeek((UCalendarDaysOfWeek)newValue);
+      break;
+
   case UCAL_MINIMAL_DAYS_IN_FIRST_WEEK:
   case UCAL_MINIMAL_DAYS_IN_FIRST_WEEK:
-    ((Calendar*)cal)->setMinimalDaysInFirstWeek((uint8_t)newValue);
-    break;
-  }
+      ((Calendar*)cal)->setMinimalDaysInFirstWeek((uint8_t)newValue);
+      break;
+    }
 }
 
 U_CAPI const char* U_EXPORT2
 ucal_getAvailable(int32_t index)
 {
 
 }
 
 U_CAPI const char* U_EXPORT2
 ucal_getAvailable(int32_t index)
 {
 
-  return uloc_getAvailable(index);
+    return uloc_getAvailable(index);
 }
 
 U_CAPI int32_t U_EXPORT2
 ucal_countAvailable()
 {
 
 }
 
 U_CAPI int32_t U_EXPORT2
 ucal_countAvailable()
 {
 
-  return uloc_countAvailable();
+    return uloc_countAvailable();
 }
 
 U_CAPI UDate  U_EXPORT2
 ucal_getMillis(    const    UCalendar*      cal,
 }
 
 U_CAPI UDate  U_EXPORT2
 ucal_getMillis(    const    UCalendar*      cal,
-        UErrorCode*     status)
+               UErrorCode*     status)
 {
 
 {
 
-  if(U_FAILURE(*status)) return (UDate) 0;
+    if(U_FAILURE(*status)) return (UDate) 0;
 
 
-  return ((Calendar*)cal)->getTime(*status);
+    return ((Calendar*)cal)->getTime(*status);
 }
 
 U_CAPI void  U_EXPORT2
 ucal_setMillis(        UCalendar*      cal,
 }
 
 U_CAPI void  U_EXPORT2
 ucal_setMillis(        UCalendar*      cal,
-            UDate           dateTime,
-            UErrorCode*     status )
+               UDate           dateTime,
+               UErrorCode*     status )
 {
 {
-  if(U_FAILURE(*status)) return;
+    if(U_FAILURE(*status)) return;
 
 
-  ((Calendar*)cal)->setTime(dateTime, *status);
+    ((Calendar*)cal)->setTime(dateTime, *status);
 }
 
 // TBD: why does this take an UErrorCode?
 U_CAPI void  U_EXPORT2
 ucal_setDate(        UCalendar*        cal,
 }
 
 // TBD: why does this take an UErrorCode?
 U_CAPI void  U_EXPORT2
 ucal_setDate(        UCalendar*        cal,
-            int32_t            year,
-            int32_t            month,
-            int32_t            date,
-            UErrorCode        *status)
+             int32_t            year,
+             int32_t            month,
+             int32_t            date,
+             UErrorCode        *status)
 {
 
 {
 
-  if(U_FAILURE(*status)) return;
+    if(U_FAILURE(*status)) return;
 
 
-  ((Calendar*)cal)->set(year, month, date);
+    ((Calendar*)cal)->set(year, month, date);
 }
 
 // TBD: why does this take an UErrorCode?
 U_CAPI void  U_EXPORT2
 ucal_setDateTime(    UCalendar*        cal,
 }
 
 // TBD: why does this take an UErrorCode?
 U_CAPI void  U_EXPORT2
 ucal_setDateTime(    UCalendar*        cal,
-            int32_t            year,
-            int32_t            month,
-            int32_t            date,
-            int32_t            hour,
-            int32_t            minute,
-            int32_t            second,
-            UErrorCode        *status)
+                 int32_t            year,
+                 int32_t            month,
+                 int32_t            date,
+                 int32_t            hour,
+                 int32_t            minute,
+                 int32_t            second,
+                 UErrorCode        *status)
 {
 {
-  if(U_FAILURE(*status)) return;
+    if(U_FAILURE(*status)) return;
 
 
-  ((Calendar*)cal)->set(year, month, date, hour, minute, second);
+    ((Calendar*)cal)->set(year, month, date, hour, minute, second);
 }
 
 U_CAPI UBool  U_EXPORT2
 ucal_equivalentTo(    const UCalendar*      cal1,
 }
 
 U_CAPI UBool  U_EXPORT2
 ucal_equivalentTo(    const UCalendar*      cal1,
-            const UCalendar*      cal2)
+                  const UCalendar*      cal2)
 {
 
 {
 
-  return ((Calendar*)cal1)->isEquivalentTo(*((Calendar*)cal2));
+    return ((Calendar*)cal1)->isEquivalentTo(*((Calendar*)cal2));
 }
 
 U_CAPI void  U_EXPORT2
 ucal_add(    UCalendar*                cal,
 }
 
 U_CAPI void  U_EXPORT2
 ucal_add(    UCalendar*                cal,
-        UCalendarDateFields        field,
-        int32_t                    amount,
-        UErrorCode*                status)
+         UCalendarDateFields        field,
+         int32_t                    amount,
+         UErrorCode*                status)
 {
 
 {
 
-  if(U_FAILURE(*status)) return;
+    if(U_FAILURE(*status)) return;
 
 
-  ((Calendar*)cal)->add(field, amount, *status);
+    ((Calendar*)cal)->add(field, amount, *status);
 }
 
 U_CAPI void  U_EXPORT2
 ucal_roll(        UCalendar*            cal,
 }
 
 U_CAPI void  U_EXPORT2
 ucal_roll(        UCalendar*            cal,
-            UCalendarDateFields field,
-            int32_t                amount,
-            UErrorCode*            status)
+          UCalendarDateFields field,
+          int32_t                amount,
+          UErrorCode*            status)
 {
 
 {
 
-  if(U_FAILURE(*status)) return;
+    if(U_FAILURE(*status)) return;
 
 
-  ((Calendar*)cal)->roll(field, amount, *status);
+    ((Calendar*)cal)->roll(field, amount, *status);
 }
 
 U_CAPI int32_t  U_EXPORT2
 ucal_get(    const    UCalendar*                cal,
 }
 
 U_CAPI int32_t  U_EXPORT2
 ucal_get(    const    UCalendar*                cal,
-        UCalendarDateFields        field,
-        UErrorCode*                status )
+         UCalendarDateFields        field,
+         UErrorCode*                status )
 {
 
 {
 
-  if(U_FAILURE(*status)) return -1;
+    if(U_FAILURE(*status)) return -1;
 
 
-  return ((Calendar*)cal)->get(field, *status);
+    return ((Calendar*)cal)->get(field, *status);
 }
 
 U_CAPI void  U_EXPORT2
 ucal_set(    UCalendar*                cal,
 }
 
 U_CAPI void  U_EXPORT2
 ucal_set(    UCalendar*                cal,
-        UCalendarDateFields        field,
-        int32_t                    value)
+         UCalendarDateFields        field,
+         int32_t                    value)
 {
 
 {
 
-  ((Calendar*)cal)->set(field, value);
+    ((Calendar*)cal)->set(field, value);
 }
 
 U_CAPI UBool  U_EXPORT2
 ucal_isSet(    const    UCalendar*                cal,
 }
 
 U_CAPI UBool  U_EXPORT2
 ucal_isSet(    const    UCalendar*                cal,
-        UCalendarDateFields        field)
+           UCalendarDateFields        field)
 {
 
 {
 
-  return ((Calendar*)cal)->isSet(field);
+    return ((Calendar*)cal)->isSet(field);
 }
 
 U_CAPI void  U_EXPORT2
 ucal_clearField(    UCalendar*            cal,
 }
 
 U_CAPI void  U_EXPORT2
 ucal_clearField(    UCalendar*            cal,
-            UCalendarDateFields field)
+                UCalendarDateFields field)
 {
 
 {
 
-  ((Calendar*)cal)->clear(field);
+    ((Calendar*)cal)->clear(field);
 }
 
 U_CAPI void  U_EXPORT2
 ucal_clear(UCalendar* calendar)
 {
 
 }
 
 U_CAPI void  U_EXPORT2
 ucal_clear(UCalendar* calendar)
 {
 
-  ((Calendar*)calendar)->clear();
+    ((Calendar*)calendar)->clear();
 }
 
 U_CAPI int32_t  U_EXPORT2
 ucal_getLimit(    const    UCalendar*              cal,
 }
 
 U_CAPI int32_t  U_EXPORT2
 ucal_getLimit(    const    UCalendar*              cal,
-            UCalendarDateFields     field,
-            UCalendarLimitType      type,
-            UErrorCode        *status)
+              UCalendarDateFields     field,
+              UCalendarLimitType      type,
+              UErrorCode        *status)
 {
 
 {
 
-  if(status==0 || U_FAILURE(*status)) {
-    return -1;
-  }
-  
-  switch(type) {
+    if(status==0 || U_FAILURE(*status)) {
+        return -1;
+    }
+
+    switch(type) {
   case UCAL_MINIMUM:
   case UCAL_MINIMUM:
-    return ((Calendar*)cal)->getMinimum(field);
+      return ((Calendar*)cal)->getMinimum(field);
 
   case UCAL_MAXIMUM:
 
   case UCAL_MAXIMUM:
-    return ((Calendar*)cal)->getMaximum(field);
+      return ((Calendar*)cal)->getMaximum(field);
 
   case UCAL_GREATEST_MINIMUM:
 
   case UCAL_GREATEST_MINIMUM:
-    return ((Calendar*)cal)->getGreatestMinimum(field);
+      return ((Calendar*)cal)->getGreatestMinimum(field);
 
   case UCAL_LEAST_MAXIMUM:
 
   case UCAL_LEAST_MAXIMUM:
-    return ((Calendar*)cal)->getLeastMaximum(field);
+      return ((Calendar*)cal)->getLeastMaximum(field);
 
   case UCAL_ACTUAL_MINIMUM:
 
   case UCAL_ACTUAL_MINIMUM:
-    return ((Calendar*)cal)->getActualMinimum(field,
-                          *status);
+      return ((Calendar*)cal)->getActualMinimum(field,
+          *status);
 
   case UCAL_ACTUAL_MAXIMUM:
 
   case UCAL_ACTUAL_MAXIMUM:
-    return ((Calendar*)cal)->getActualMaximum(field,
-                          *status);
+      return ((Calendar*)cal)->getActualMaximum(field,
+          *status);
 
   default:
 
   default:
-    break;
-  }
-  return -1;
+      break;
+    }
+    return -1;
 }
 
 U_CAPI const char * U_EXPORT2
 }
 
 U_CAPI const char * U_EXPORT2
@@ -511,4 +505,194 @@ ucal_getLocaleByType(const UCalendar *cal, ULocDataLocaleType type, UErrorCode*
     return ((Calendar*)cal)->getLocaleID(type, *status);
 }
 
     return ((Calendar*)cal)->getLocaleID(type, *status);
 }
 
+U_CAPI const char * U_EXPORT2
+ucal_getTZDataVersion(UErrorCode* status)
+{
+    return TimeZone::getTZDataVersion(*status);
+}
+
+U_CAPI int32_t U_EXPORT2
+ucal_getCanonicalTimeZoneID(const UChar* id, int32_t len,
+                            UChar* result, int32_t resultCapacity, UBool *isSystemID, UErrorCode* status) {
+    if(status == 0 || U_FAILURE(*status)) {
+        return 0;
+    }
+    if (isSystemID) {
+        *isSystemID = FALSE;
+    }
+    if (id == 0 || len == 0 || result == 0 || resultCapacity <= 0) {
+        *status = U_ILLEGAL_ARGUMENT_ERROR;
+        return 0;
+    }
+    int32_t reslen = 0;
+    UnicodeString canonical;
+    UBool systemID = FALSE;
+    TimeZone::getCanonicalID(UnicodeString(id, len), canonical, systemID, *status);
+    if (U_SUCCESS(*status)) {
+        if (isSystemID) {
+            *isSystemID = systemID;
+        }
+        reslen = canonical.extract(result, resultCapacity, *status);
+    }
+    return reslen;
+}
+
+U_CAPI const char * U_EXPORT2
+ucal_getType(const UCalendar *cal, UErrorCode* status)
+{
+    if (U_FAILURE(*status)) {
+        return NULL;
+    }
+    return ((Calendar*)cal)->getType();
+}
+
+U_CAPI UCalendarWeekdayType U_EXPORT2
+ucal_getDayOfWeekType(const UCalendar *cal, UCalendarDaysOfWeek dayOfWeek, UErrorCode* status)
+{
+    if (U_FAILURE(*status)) {
+        return UCAL_WEEKDAY;
+    }
+    return ((Calendar*)cal)->getDayOfWeekType(dayOfWeek, *status);
+}
+
+U_CAPI int32_t U_EXPORT2
+ucal_getWeekendTransition(const UCalendar *cal, UCalendarDaysOfWeek dayOfWeek, UErrorCode *status)
+{
+    if (U_FAILURE(*status)) {
+        return 0;
+    }
+    return ((Calendar*)cal)->getWeekendTransition(dayOfWeek, *status);
+}
+
+U_CAPI UBool U_EXPORT2
+ucal_isWeekend(const UCalendar *cal, UDate date, UErrorCode *status)
+{
+    if (U_FAILURE(*status)) {
+        return FALSE;
+    }
+    return ((Calendar*)cal)->isWeekend(date, *status);
+}
+
+U_CAPI int32_t  U_EXPORT2
+ucal_getFieldDifference(UCalendar* cal, UDate target,
+                        UCalendarDateFields field,
+                        UErrorCode* status )
+{
+    if (U_FAILURE(*status)) {
+        return 0;
+    }
+    return ((Calendar*)cal)->fieldDifference(target, field, *status);
+}
+
+
+static const UEnumeration defaultKeywordValues = {
+    NULL,
+    NULL,
+    ulist_close_keyword_values_iterator,
+    ulist_count_keyword_values,
+    uenum_unextDefault,
+    ulist_next_keyword_value, 
+    ulist_reset_keyword_values_iterator
+};
+
+static const char * const CAL_TYPES[] = {
+        "gregorian",
+        "japanese",
+        "buddhist",
+        "roc",
+        "persian",
+        "islamic-civil",
+        "islamic",
+        "hebrew",
+        "chinese",
+        "indian",
+        "coptic",
+        "ethiopic",
+        "ethiopic-amete-alem",
+        NULL
+};
+
+U_CAPI UEnumeration* U_EXPORT2
+ucal_getKeywordValuesForLocale(const char * /* key */, const char* locale, UBool commonlyUsed, UErrorCode *status) {
+    // Resolve region
+    char prefRegion[ULOC_FULLNAME_CAPACITY] = "";
+    int32_t prefRegionLength = 0;
+    prefRegionLength = uloc_getCountry(locale, prefRegion, sizeof(prefRegion), status);
+    if (prefRegionLength == 0) {
+        char loc[ULOC_FULLNAME_CAPACITY] = "";
+        int32_t locLength = 0;
+        locLength = uloc_addLikelySubtags(locale, loc, sizeof(loc), status);
+        
+        prefRegionLength = uloc_getCountry(loc, prefRegion, sizeof(prefRegion), status);
+    }
+    
+    // Read preferred calendar values from supplementalData calendarPreference
+    UResourceBundle *rb = ures_openDirect(NULL, "supplementalData", status);
+    ures_getByKey(rb, "calendarPreferenceData", rb, status);
+    UResourceBundle *order = ures_getByKey(rb, prefRegion, NULL, status);
+    if (*status == U_MISSING_RESOURCE_ERROR && rb != NULL) {
+        *status = U_ZERO_ERROR;
+        order = ures_getByKey(rb, "001", NULL, status);
+    }
+
+    // Create a list of calendar type strings
+    UList *values = NULL;
+    if (U_SUCCESS(*status)) {
+        values = ulist_createEmptyList(status);
+        if (U_SUCCESS(*status)) {
+            for (int i = 0; i < ures_getSize(order); i++) {
+                int32_t len;
+                const UChar *type = ures_getStringByIndex(order, i, &len, status);
+                char *caltype = (char*)uprv_malloc(len + 1);
+                if (caltype == NULL) {
+                    *status = U_MEMORY_ALLOCATION_ERROR;
+                    break;
+                }
+                u_UCharsToChars(type, caltype, len);
+                *(caltype + len) = 0;
+
+                ulist_addItemEndList(values, caltype, TRUE, status);
+                if (U_FAILURE(*status)) {
+                    break;
+                }
+            }
+
+            if (U_SUCCESS(*status) && !commonlyUsed) {
+                // If not commonlyUsed, add other available values
+                for (int32_t i = 0; CAL_TYPES[i] != NULL; i++) {
+                    if (!ulist_containsString(values, CAL_TYPES[i], (int32_t)uprv_strlen(CAL_TYPES[i]))) {
+                        ulist_addItemEndList(values, CAL_TYPES[i], FALSE, status);
+                        if (U_FAILURE(*status)) {
+                            break;
+                        }
+                    }
+                }
+            }
+            if (U_FAILURE(*status)) {
+                ulist_deleteList(values);
+                values = NULL;
+            }
+        }
+    }
+
+    ures_close(order);
+    ures_close(rb);
+
+    if (U_FAILURE(*status) || values == NULL) {
+        return NULL;
+    }
+
+    // Create string enumeration
+    UEnumeration *en = (UEnumeration*)uprv_malloc(sizeof(UEnumeration));
+    if (en == NULL) {
+        *status = U_MEMORY_ALLOCATION_ERROR;
+        ulist_deleteList(values);
+        return NULL;
+    }
+    ulist_resetList(values);
+    memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
+    en->context = values;
+    return en;
+}
+
 #endif /* #if !UCONFIG_NO_FORMATTING */
 #endif /* #if !UCONFIG_NO_FORMATTING */