ICU-461.12.tar.gz

[apple/icu.git] / icuSources / common / uset.cpp

diff --git a/icuSources/common/uset.cpp b/icuSources/common/uset.cpp
index add0ee0f6a8993aabe71be21df5511ee2e2f2e0b..f4d34474514c37ae30b9631904d4f58a2055d0d9 100644 (file)
--- a/icuSources/common/uset.cpp
+++ b/icuSources/common/uset.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
 /*
 *******************************************************************************
 *

-*   Copyright (C) 2002-2007, International Business Machines
+*   Copyright (C) 2002-2010, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************


@@ -13,9 +13,6 @@
 *   created on: 2002mar07
 *   created by: Markus W. Scherer
 *
 *   created on: 2002mar07
 *   created by: Markus W. Scherer
 *

-*   The serialized structure, the array of range limits, is
-*   the same as in UnicodeSet, except that the HIGH value is not stored.
-*

 *   There are functions to efficiently serialize a USet into an array of uint16_t
 *   and functions to use such a serialized form efficiently without
 *   instantiating a new USet.
 *   There are functions to efficiently serialize a USet into an array of uint16_t
 *   and functions to use such a serialized form efficiently without
 *   instantiating a new USet.


@@ -31,6 +28,11 @@
 
 U_NAMESPACE_USE
 
 
 U_NAMESPACE_USE
 

+U_CAPI USet* U_EXPORT2
+uset_openEmpty() {
+    return (USet*) new UnicodeSet();
+}
+

 U_CAPI USet* U_EXPORT2
 uset_open(UChar32 start, UChar32 end) {
     return (USet*) new UnicodeSet(start, end);
 U_CAPI USet* U_EXPORT2
 uset_open(UChar32 start, UChar32 end) {
     return (USet*) new UnicodeSet(start, end);


@@ -147,6 +149,16 @@ uset_clear(USet* set) {
     ((UnicodeSet*) set)->UnicodeSet::clear();
 }
 
     ((UnicodeSet*) set)->UnicodeSet::clear();
 }
 

+U_CAPI void U_EXPORT2
+uset_closeOver(USet* set, int32_t attributes) {
+    ((UnicodeSet*) set)->UnicodeSet::closeOver(attributes);
+}
+
+U_CAPI void U_EXPORT2
+uset_removeAllStrings(USet* set) {
+    ((UnicodeSet*) set)->UnicodeSet::removeAllStrings();
+}
+

 U_CAPI UBool U_EXPORT2
 uset_isEmpty(const USet* set) {
     return ((const UnicodeSet*) set)->UnicodeSet::isEmpty();
 U_CAPI UBool U_EXPORT2
 uset_isEmpty(const USet* set) {
     return ((const UnicodeSet*) set)->UnicodeSet::isEmpty();


@@ -482,13 +494,12 @@ uset_getSerializedRange(const USerializedSet* set, int32_t rangeIndex,
     if(rangeIndex<bmpLength) {
         *pStart=array[rangeIndex++];
         if(rangeIndex<bmpLength) {
     if(rangeIndex<bmpLength) {
         *pStart=array[rangeIndex++];
         if(rangeIndex<bmpLength) {

-            *pEnd=array[rangeIndex];
+            *pEnd=array[rangeIndex]-1;

         } else if(rangeIndex<length) {
         } else if(rangeIndex<length) {

-            *pEnd=(((int32_t)array[rangeIndex])<<16)|array[rangeIndex+1];
+            *pEnd=((((int32_t)array[rangeIndex])<<16)|array[rangeIndex+1])-1;

         } else {
         } else {

-            *pEnd=0x110000;
+            *pEnd=0x10ffff;

         }
         }

-        --*pEnd;

         return TRUE;
     } else {
         rangeIndex-=bmpLength;
         return TRUE;
     } else {
         rangeIndex-=bmpLength;


@@ -499,11 +510,10 @@ uset_getSerializedRange(const USerializedSet* set, int32_t rangeIndex,
             *pStart=(((int32_t)array[rangeIndex])<<16)|array[rangeIndex+1];
             rangeIndex+=2;
             if(rangeIndex<length) {
             *pStart=(((int32_t)array[rangeIndex])<<16)|array[rangeIndex+1];
             rangeIndex+=2;
             if(rangeIndex<length) {

-                *pEnd=(((int32_t)array[rangeIndex])<<16)|array[rangeIndex+1];
+                *pEnd=((((int32_t)array[rangeIndex])<<16)|array[rangeIndex+1])-1;

             } else {
             } else {

-                *pEnd=0x110000;
+                *pEnd=0x10ffff;

             }
             }

-            --*pEnd;

             return TRUE;
         } else {
             return FALSE;
             return TRUE;
         } else {
             return FALSE;