ICU-57131.0.1.tar.gz

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

diff --git a/icuSources/i18n/fmtable.cpp b/icuSources/i18n/fmtable.cpp
index 274b3d782d069f3e1450efb866d2e32b496cb8f6..9fdef20c3ae984ca0be5d37c120f58181bea82b3 100644 (file)
--- a/icuSources/i18n/fmtable.cpp
+++ b/icuSources/i18n/fmtable.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 /*
 *******************************************************************************

-* Copyright (C) 1997-2012, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 1997-2016, International Business Machines Corporation and
+* others. All Rights Reserved.

 *******************************************************************************
 *
 * File FMTABLE.CPP
 *******************************************************************************
 *
 * File FMTABLE.CPP


@@ -22,11 +22,13 @@
 #include "unicode/ustring.h"
 #include "unicode/measure.h"
 #include "unicode/curramt.h"
 #include "unicode/ustring.h"
 #include "unicode/measure.h"
 #include "unicode/curramt.h"

+#include "unicode/uformattable.h"

 #include "charstr.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "decNumber.h"
 #include "digitlst.h"
 #include "charstr.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "decNumber.h"
 #include "digitlst.h"

+#include "fmtableimp.h"

 
 // *****************************************************************************
 // class Formattable
 
 // *****************************************************************************
 // class Formattable


@@ -36,7 +38,6 @@ U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(Formattable)
 
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(Formattable)
 

-#include "fmtableimp.h"

 
 //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 
 
 //-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.
 


@@ -400,7 +401,7 @@ Formattable::getLong(UErrorCode& status) const
     switch (fType) {
     case Formattable::kLong: 
         return (int32_t)fValue.fInt64;
     switch (fType) {
     case Formattable::kLong: 
         return (int32_t)fValue.fInt64;

-    case Formattable::kInt64: 
+    case Formattable::kInt64:

         if (fValue.fInt64 > INT32_MAX) {
             status = U_INVALID_FORMAT_ERROR;
             return INT32_MAX;
         if (fValue.fInt64 > INT32_MAX) {
             status = U_INVALID_FORMAT_ERROR;
             return INT32_MAX;


@@ -430,7 +431,8 @@ Formattable::getLong(UErrorCode& status) const
             return ((const Measure*) fValue.fObject)->
                 getNumber().getLong(status);
         }
             return ((const Measure*) fValue.fObject)->
                 getNumber().getLong(status);
         }

-    default: 
+        U_FALLTHROUGH;
+    default:

         status = U_INVALID_FORMAT_ERROR;
         return 0;
     }
         status = U_INVALID_FORMAT_ERROR;
         return 0;
     }


@@ -481,7 +483,8 @@ Formattable::getInt64(UErrorCode& status) const
             return ((const Measure*) fValue.fObject)->
                 getNumber().getInt64(status);
         }
             return ((const Measure*) fValue.fObject)->
                 getNumber().getInt64(status);
         }

-    default: 
+        U_FALLTHROUGH;
+    default:

         status = U_INVALID_FORMAT_ERROR;
         return 0;
     }
         status = U_INVALID_FORMAT_ERROR;
         return 0;
     }


@@ -511,7 +514,8 @@ Formattable::getDouble(UErrorCode& status) const
             return ((const Measure*) fValue.fObject)->
                 getNumber().getDouble(status);
         }
             return ((const Measure*) fValue.fObject)->
                 getNumber().getDouble(status);
         }

-    default: 
+        U_FALLTHROUGH;
+    default:

         status = U_INVALID_FORMAT_ERROR;
         return 0;
     }
         status = U_INVALID_FORMAT_ERROR;
         return 0;
     }


@@ -695,46 +699,56 @@ StringPiece Formattable::getDecimalNumber(UErrorCode &status) {
         return "";
     }
     if (fDecimalStr != NULL) {
         return "";
     }
     if (fDecimalStr != NULL) {

-        return fDecimalStr->toStringPiece();
+      return fDecimalStr->toStringPiece();
+    }
+
+    CharString *decimalStr = internalGetCharString(status);
+    if(decimalStr == NULL) {
+      return ""; // getDecimalNumber returns "" for error cases
+    } else {
+      return decimalStr->toStringPiece();

     }
     }

+}

 
 

-    if (fDecimalNum == NULL) {
+CharString *Formattable::internalGetCharString(UErrorCode &status) {
+    if(fDecimalStr == NULL) {
+      if (fDecimalNum == NULL) {

         // No decimal number for the formattable yet.  Which means the value was
         // set directly by the user as an int, int64 or double.  If the value came
         // from parsing, or from the user setting a decimal number, fDecimalNum
         // would already be set.
         //
         // No decimal number for the formattable yet.  Which means the value was
         // set directly by the user as an int, int64 or double.  If the value came
         // from parsing, or from the user setting a decimal number, fDecimalNum
         // would already be set.
         //

-      fDecimalNum = new DigitList; // TODO: use internal digit list
+        fDecimalNum = new DigitList; // TODO: use internal digit list

         if (fDecimalNum == NULL) {
         if (fDecimalNum == NULL) {

-            status = U_MEMORY_ALLOCATION_ERROR;
-            return "";
+          status = U_MEMORY_ALLOCATION_ERROR;
+          return NULL;

         }
 
         switch (fType) {
         case kDouble:
         }
 
         switch (fType) {
         case kDouble:

-            fDecimalNum->set(this->getDouble());
-            break;
+          fDecimalNum->set(this->getDouble());
+          break;

         case kLong:
         case kLong:

-            fDecimalNum->set(this->getLong());
-            break;
+          fDecimalNum->set(this->getLong());
+          break;

         case kInt64:
         case kInt64:

-            fDecimalNum->set(this->getInt64());
-            break;
+          fDecimalNum->set(this->getInt64());
+          break;

         default:
         default:

-            // The formattable's value is not a numeric type.
-            status = U_INVALID_STATE_ERROR;
-            return "";
+          // The formattable's value is not a numeric type.
+          status = U_INVALID_STATE_ERROR;
+          return NULL;

         }
         }

-    }
+      }

 
 

-    fDecimalStr = new CharString;
-    if (fDecimalStr == NULL) {
+      fDecimalStr = new CharString;
+      if (fDecimalStr == NULL) {

         status = U_MEMORY_ALLOCATION_ERROR;
         status = U_MEMORY_ALLOCATION_ERROR;

-        return "";
+        return NULL;
+      }
+      fDecimalNum->getDecimal(*fDecimalStr, status);

     }
     }

-    fDecimalNum->getDecimal(*fDecimalStr, status);
-
-    return fDecimalStr->toStringPiece();
+    return fDecimalStr;

 }
 
 
 }
 
 


@@ -884,6 +898,152 @@ FormattableStreamer::streamOut(ostream& stream, const Formattable& obj)
 
 U_NAMESPACE_END
 
 
 U_NAMESPACE_END
 

+/* ---- UFormattable implementation ---- */
+
+U_NAMESPACE_USE
+
+U_DRAFT UFormattable* U_EXPORT2
+ufmt_open(UErrorCode *status) {
+  if( U_FAILURE(*status) ) {
+    return NULL;
+  }
+  UFormattable *fmt = (new Formattable())->toUFormattable();
+
+  if( fmt == NULL ) {
+    *status = U_MEMORY_ALLOCATION_ERROR;
+  }
+  return fmt;
+}
+
+U_DRAFT void U_EXPORT2
+ufmt_close(UFormattable *fmt) {
+  Formattable *obj = Formattable::fromUFormattable(fmt);
+
+  delete obj;
+}
+
+U_INTERNAL UFormattableType U_EXPORT2
+ufmt_getType(const UFormattable *fmt, UErrorCode *status) {
+  if(U_FAILURE(*status)) {
+    return (UFormattableType)UFMT_COUNT;
+  }
+  const Formattable *obj = Formattable::fromUFormattable(fmt);
+  return (UFormattableType)obj->getType();
+}
+
+
+U_INTERNAL UBool U_EXPORT2
+ufmt_isNumeric(const UFormattable *fmt) {
+  const Formattable *obj = Formattable::fromUFormattable(fmt);
+  return obj->isNumeric();
+}
+
+U_DRAFT UDate U_EXPORT2
+ufmt_getDate(const UFormattable *fmt, UErrorCode *status) {
+  const Formattable *obj = Formattable::fromUFormattable(fmt);
+
+  return obj->getDate(*status);
+}
+
+U_DRAFT double U_EXPORT2
+ufmt_getDouble(UFormattable *fmt, UErrorCode *status) {
+  Formattable *obj = Formattable::fromUFormattable(fmt);
+
+  return obj->getDouble(*status);
+}
+
+U_DRAFT int32_t U_EXPORT2
+ufmt_getLong(UFormattable *fmt, UErrorCode *status) {
+  Formattable *obj = Formattable::fromUFormattable(fmt);
+
+  return obj->getLong(*status);
+}
+
+
+U_DRAFT const void *U_EXPORT2
+ufmt_getObject(const UFormattable *fmt, UErrorCode *status) {
+  const Formattable *obj = Formattable::fromUFormattable(fmt);
+
+  const void *ret = obj->getObject();
+  if( ret==NULL &&
+      (obj->getType() != Formattable::kObject) &&
+      U_SUCCESS( *status )) {
+    *status = U_INVALID_FORMAT_ERROR;
+  }
+  return ret;
+}
+
+U_DRAFT const UChar* U_EXPORT2
+ufmt_getUChars(UFormattable *fmt, int32_t *len, UErrorCode *status) {
+  Formattable *obj = Formattable::fromUFormattable(fmt);
+
+  // avoid bogosity by checking the type first.
+  if( obj->getType() != Formattable::kString ) {
+    if( U_SUCCESS(*status) ){
+      *status = U_INVALID_FORMAT_ERROR;
+    }
+    return NULL;
+  }
+
+  // This should return a valid string
+  UnicodeString &str = obj->getString(*status);
+  if( U_SUCCESS(*status) && len != NULL ) {
+    *len = str.length();
+  }
+  return str.getTerminatedBuffer();
+}
+
+U_DRAFT int32_t U_EXPORT2
+ufmt_getArrayLength(const UFormattable* fmt, UErrorCode *status) {
+  const Formattable *obj = Formattable::fromUFormattable(fmt);
+
+  int32_t count;
+  (void)obj->getArray(count, *status);
+  return count;
+}
+
+U_DRAFT UFormattable * U_EXPORT2
+ufmt_getArrayItemByIndex(UFormattable* fmt, int32_t n, UErrorCode *status) {
+  Formattable *obj = Formattable::fromUFormattable(fmt);
+  int32_t count;
+  (void)obj->getArray(count, *status);
+  if(U_FAILURE(*status)) {
+    return NULL;
+  } else if(n<0 || n>=count) {
+    setError(*status, U_INDEX_OUTOFBOUNDS_ERROR);
+    return NULL;
+  } else {
+    return (*obj)[n].toUFormattable(); // returns non-const Formattable
+  }
+}
+
+U_DRAFT const char * U_EXPORT2
+ufmt_getDecNumChars(UFormattable *fmt, int32_t *len, UErrorCode *status) {
+  if(U_FAILURE(*status)) {
+    return "";
+  }
+  Formattable *obj = Formattable::fromUFormattable(fmt);
+  CharString *charString = obj->internalGetCharString(*status);
+  if(U_FAILURE(*status)) {
+    return "";
+  }
+  if(charString == NULL) {
+    *status = U_MEMORY_ALLOCATION_ERROR;
+    return "";
+  } else {
+    if(len!=NULL) {
+      *len = charString->length();
+    }
+    return charString->data();
+  }
+}
+
+U_DRAFT int64_t U_EXPORT2
+ufmt_getInt64(UFormattable *fmt, UErrorCode *status) {
+  Formattable *obj = Formattable::fromUFormattable(fmt);
+  return obj->getInt64(*status);
+}
+

 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof