ICU-6.2.14.tar.gz

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

diff --git a/icuSources/i18n/tolowtrn.cpp b/icuSources/i18n/tolowtrn.cpp
index 1187412eb464b24c4dd5171cccf334c2302b86a9..6eab680c60453594c9a76ecfc0a9518954bb1183 100644 (file)
--- a/icuSources/i18n/tolowtrn.cpp
+++ b/icuSources/i18n/tolowtrn.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 2001, International Business Machines
+*   Copyright (C) 2001-2004, International Business Machines

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


@@ -20,34 +20,28 @@
 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 

-const char LowercaseTransliterator::fgClassID=0;
-
-const char LowercaseTransliterator::_ID[] = "Any-Lower";
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(LowercaseTransliterator)

 
 /**
  * Constructs a transliterator.
  */
 
 /**
  * Constructs a transliterator.
  */

-LowercaseTransliterator::LowercaseTransliterator(const Locale& theLoc) : Transliterator(_ID, 0),
-    loc(theLoc) , buffer(0)
+LowercaseTransliterator::LowercaseTransliterator(const Locale& theLoc) : 
+    CaseMapTransliterator(theLoc, UNICODE_STRING("Any-Lower", 9), ucase_toFullLower)

 {
 {

-    buffer = (UChar *)uprv_malloc(u_getMaxCaseExpansion()*sizeof(buffer[0]));

 }
 
 /**
  * Destructor.
  */
 LowercaseTransliterator::~LowercaseTransliterator() {
 }
 
 /**
  * Destructor.
  */
 LowercaseTransliterator::~LowercaseTransliterator() {

-    uprv_free(buffer);

 }
 
 /**
  * Copy constructor.
  */
 LowercaseTransliterator::LowercaseTransliterator(const LowercaseTransliterator& o) :
 }
 
 /**
  * Copy constructor.
  */
 LowercaseTransliterator::LowercaseTransliterator(const LowercaseTransliterator& o) :

-    Transliterator(o),
-    loc(o.loc), buffer(0)
+    CaseMapTransliterator(o)

 {
 {

-    buffer = (UChar *)uprv_malloc(u_getMaxCaseExpansion()*sizeof(buffer[0]));

 }
 
 /**
 }
 
 /**


@@ -55,9 +49,7 @@ LowercaseTransliterator::LowercaseTransliterator(const LowercaseTransliterator&
  */
 LowercaseTransliterator& LowercaseTransliterator::operator=(
                              const LowercaseTransliterator& o) {
  */
 LowercaseTransliterator& LowercaseTransliterator::operator=(
                              const LowercaseTransliterator& o) {

-    Transliterator::operator=(o);
-    loc = o.loc;
-    uprv_arrayCopy((const UChar*)o.buffer, 0, this->buffer, 0, u_getMaxCaseExpansion());
+    CaseMapTransliterator::operator=(o);

     return *this;
 }
 
     return *this;
 }
 


@@ -68,54 +60,6 @@ Transliterator* LowercaseTransliterator::clone(void) const {
     return new LowercaseTransliterator(*this);
 }
 
     return new LowercaseTransliterator(*this);
 }
 

-/**
- * Implements {@link Transliterator#handleTransliterate}.
- */
-void LowercaseTransliterator::handleTransliterate(Replaceable& text,
-                                 UTransPosition& offsets, 
-                                 UBool isIncremental) const
-{
-    int32_t textPos = offsets.start;
-    if (textPos >= offsets.limit) return;
-
-    // get string for context
-
-    UnicodeString original;
-    text.extractBetween(offsets.contextStart, offsets.contextLimit, original);
-    
-    UCharIterator iter;
-    uiter_setReplaceable(&iter, &text);
-    iter.start = offsets.contextStart;
-    iter.limit = offsets.contextLimit;
-
-    // Walk through original string
-    // If there is a case change, modify corresponding position in replaceable
-    
-    int32_t i = textPos - offsets.contextStart;
-    int32_t limit = offsets.limit - offsets.contextStart;
-    UChar32 cp;
-    int32_t oldLen;
-    
-    for (; i < limit; ) { 
-        UTF_GET_CHAR(original.getBuffer(), 0, i, original.length(), cp);
-        oldLen = UTF_CHAR_LENGTH(cp);
-        i += oldLen;
-        iter.index = i; // Point _past_ current char
-        int32_t newLen = u_internalToLower(cp, &iter, buffer, u_getMaxCaseExpansion(), loc.getName());
-        if (newLen >= 0) {
-            UnicodeString temp(buffer, newLen);
-            text.handleReplaceBetween(textPos, textPos + oldLen, temp);
-            if (newLen != oldLen) {
-                textPos += newLen;
-                offsets.limit += newLen - oldLen;
-                offsets.contextLimit += newLen - oldLen;
-                continue;
-            }
-        }
-        textPos += oldLen;
-    }
-    offsets.start = offsets.limit;
-}

 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */