ICU-531.31.tar.gz

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

diff --git a/icuSources/i18n/translit.cpp b/icuSources/i18n/translit.cpp
index 84364796af974ea7e6d43bf85cad2ba113776182..bb9ba9b19039564fb0a520c1494e674ae46f92cf 100644 (file)
--- a/icuSources/i18n/translit.cpp
+++ b/icuSources/i18n/translit.cpp
@@ -1,6 +1,6 @@
 /*
  **********************************************************************
 /*
  **********************************************************************

- *   Copyright (C) 1999-2010, International Business Machines
+ *   Copyright (C) 1999-2012, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *   Date        Name        Description
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *   Date        Name        Description


@@ -8,7 +8,7 @@
  **********************************************************************
  */
 
  **********************************************************************
  */
 

-#include <typeinfo>  // for 'typeid' to work
+#include "utypeinfo.h"  // for 'typeid' to work

 
 #include "unicode/utypes.h"
 
 
 #include "unicode/utypes.h"
 


@@ -24,6 +24,7 @@
 #include "unicode/uniset.h"
 #include "unicode/uscript.h"
 #include "unicode/strenum.h"
 #include "unicode/uniset.h"
 #include "unicode/uscript.h"
 #include "unicode/strenum.h"

+#include "unicode/utf16.h"

 #include "cpdtrans.h"
 #include "nultrans.h"
 #include "rbt_data.h"
 #include "cpdtrans.h"
 #include "nultrans.h"
 #include "rbt_data.h"


@@ -88,20 +89,17 @@ static const char RB_RULE_BASED_IDS[] = "RuleBasedTransliteratorIDs";
 /**
  * The mutex controlling access to registry object.
  */
 /**
  * The mutex controlling access to registry object.
  */

-static UMTX registryMutex = 0;
+static UMutex registryMutex = U_MUTEX_INITIALIZER;

 
 /**
  * System transliterator registry; non-null when initialized.
  */
 
 /**
  * System transliterator registry; non-null when initialized.
  */

-static U_NAMESPACE_QUALIFIER TransliteratorRegistry* registry = 0;
+static icu::TransliteratorRegistry* registry = 0;

 
 // Macro to check/initialize the registry. ONLY USE WITHIN
 // MUTEX. Avoids function call when registry is initialized.
 #define HAVE_REGISTRY(status) (registry!=0 || initializeRegistry(status))
 
 
 // Macro to check/initialize the registry. ONLY USE WITHIN
 // MUTEX. Avoids function call when registry is initialized.
 #define HAVE_REGISTRY(status) (registry!=0 || initializeRegistry(status))
 

-// Empty string
-static const UChar EMPTY[] = {0}; //""
-

 U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(Transliterator)
 U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(Transliterator)


@@ -371,7 +369,7 @@ void Transliterator::_transliterate(Replaceable& text,
     }
 
     if (index.limit > 0 &&
     }
 
     if (index.limit > 0 &&

-        UTF_IS_LEAD(text.charAt(index.limit - 1))) {
+        U16_IS_LEAD(text.charAt(index.limit - 1))) {

         // Oops, there is a dangling lead surrogate in the buffer.
         // This will break most transliterators, since they will
         // assume it is part of a pair.  Don't transliterate until
         // Oops, there is a dangling lead surrogate in the buffer.
         // This will break most transliterators, since they will
         // assume it is part of a pair.  Don't transliterate until


@@ -410,7 +408,7 @@ void Transliterator::_transliterate(Replaceable& text,
     int32_t n = getMaximumContextLength();
     while (newCS > originalStart && n-- > 0) {
         --newCS;
     int32_t n = getMaximumContextLength();
     while (newCS > originalStart && n-- > 0) {
         --newCS;

-        newCS -= UTF_CHAR_LENGTH(text.char32At(newCS)) - 1;
+        newCS -= U16_LENGTH(text.char32At(newCS)) - 1;

     }
     index.contextStart = uprv_max(newCS, originalStart);
 #endif
     }
     index.contextStart = uprv_max(newCS, originalStart);
 #endif


@@ -481,14 +479,14 @@ void Transliterator::filteredTransliterate(Replaceable& text,
             UChar32 c;
             while (index.start < globalLimit &&
                    !filter->contains(c=text.char32At(index.start))) {
             UChar32 c;
             while (index.start < globalLimit &&
                    !filter->contains(c=text.char32At(index.start))) {

-                index.start += UTF_CHAR_LENGTH(c);
+                index.start += U16_LENGTH(c);

             }
 
             // Find the end of this run of unfiltered chars
             index.limit = index.start;
             while (index.limit < globalLimit &&
                    filter->contains(c=text.char32At(index.limit))) {
             }
 
             // Find the end of this run of unfiltered chars
             index.limit = index.start;
             while (index.limit < globalLimit &&
                    filter->contains(c=text.char32At(index.limit))) {

-                index.limit += UTF_CHAR_LENGTH(c);
+                index.limit += U16_LENGTH(c);

             }
         }
 
             }
         }
 


@@ -571,8 +569,7 @@ void Transliterator::filteredTransliterate(Replaceable& text,
             // transliterations and commit complete transliterations.
             for (;;) {
                 // Length of additional code point, either one or two
             // transliterations and commit complete transliterations.
             for (;;) {
                 // Length of additional code point, either one or two

-                int32_t charLength =
-                    UTF_CHAR_LENGTH(text.char32At(passLimit));
+                int32_t charLength = U16_LENGTH(text.char32At(passLimit));

                 passLimit += charLength;
                 if (passLimit > runLimit) {
                     break;
                 passLimit += charLength;
                 if (passLimit > runLimit) {
                     break;


@@ -598,7 +595,7 @@ void Transliterator::filteredTransliterate(Replaceable& text,
                     int32_t rs = rollbackStart + delta - (index.limit - passStart);
 
                     // Delete the partially transliterated text
                     int32_t rs = rollbackStart + delta - (index.limit - passStart);
 
                     // Delete the partially transliterated text

-                    text.handleReplaceBetween(passStart, index.limit, EMPTY);
+                    text.handleReplaceBetween(passStart, index.limit, UnicodeString());

 
                     // Copy the rollback text back
                     text.copy(rs, rs + uncommittedLength, passStart);
 
                     // Copy the rollback text back
                     text.copy(rs, rs + uncommittedLength, passStart);


@@ -636,7 +633,7 @@ void Transliterator::filteredTransliterate(Replaceable& text,
             globalLimit += totalDelta;
 
             // Delete the rollback copy
             globalLimit += totalDelta;
 
             // Delete the rollback copy

-            text.handleReplaceBetween(rollbackOrigin, rollbackOrigin + runLength, EMPTY);
+            text.handleReplaceBetween(rollbackOrigin, rollbackOrigin + runLength, UnicodeString());

 
             // Move start past committed text
             index.start = passStart;
 
             // Move start past committed text
             index.start = passStart;


@@ -1110,7 +1107,8 @@ Transliterator::createFromRules(const UnicodeString& ID,
             }
             if (!parser.dataVector.isEmpty()) {
                 TransliterationRuleData* data = (TransliterationRuleData*)parser.dataVector.orphanElementAt(0);
             }
             if (!parser.dataVector.isEmpty()) {
                 TransliterationRuleData* data = (TransliterationRuleData*)parser.dataVector.orphanElementAt(0);

-                RuleBasedTransliterator* temprbt = new RuleBasedTransliterator(UnicodeString(CompoundTransliterator::PASS_STRING) + (passNumber++),
+                // TODO: Should passNumber be turned into a decimal-string representation (1 -> "1")?
+                RuleBasedTransliterator* temprbt = new RuleBasedTransliterator(UnicodeString(CompoundTransliterator::PASS_STRING) + UnicodeString(passNumber++),

                         data, TRUE);
                 // Check if NULL before adding it to transliterators to avoid future usage of NULL pointer.
                 if (temprbt == NULL) {
                         data, TRUE);
                 // Check if NULL before adding it to transliterators to avoid future usage of NULL pointer.
                 if (temprbt == NULL) {


@@ -1146,7 +1144,7 @@ UnicodeString& Transliterator::toRules(UnicodeString& rulesSource,
             if (!ICU_Utility::escapeUnprintable(rulesSource, c)) {
                 rulesSource.append(c);
             }
             if (!ICU_Utility::escapeUnprintable(rulesSource, c)) {
                 rulesSource.append(c);
             }

-            i += UTF_CHAR_LENGTH(c);
+            i += U16_LENGTH(c);

         }
     } else {
         rulesSource = getID();
         }
     } else {
         rulesSource = getID();


@@ -1635,7 +1633,6 @@ U_CFUNC UBool utrans_transliterator_cleanup(void) {
         delete registry;
         registry = NULL;
     }
         delete registry;
         registry = NULL;
     }

-    umtx_destroy(&registryMutex);

     return TRUE;
 }
 
     return TRUE;
 }