ICU-66108.tar.gz

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

diff --git a/icuSources/i18n/casetrn.cpp b/icuSources/i18n/casetrn.cpp
index 20a73e342949c67086adf7832972dc8002a568ee..bb650f8fa29e17d64d08cc600e0d43c2e4ae0f14 100644 (file)
--- a/icuSources/i18n/casetrn.cpp
+++ b/icuSources/i18n/casetrn.cpp
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 *******************************************************************************
 *
 /*
 *******************************************************************************
 *


@@ -6,7 +8,7 @@
 *
 *******************************************************************************
 *   file name:  casetrn.cpp
 *
 *******************************************************************************
 *   file name:  casetrn.cpp

-*   encoding:   US-ASCII
+*   encoding:   UTF-8

 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   tab size:   8 (not used)
 *   indentation:4
 *


@@ -90,7 +92,6 @@ UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(CaseMapTransliterator)
  */
 CaseMapTransliterator::CaseMapTransliterator(const UnicodeString &id, UCaseMapFull *map) : 
     Transliterator(id, 0),
  */
 CaseMapTransliterator::CaseMapTransliterator(const UnicodeString &id, UCaseMapFull *map) : 
     Transliterator(id, 0),

-    fCsp(ucase_getSingleton()),

     fMap(map)
 {
     // TODO test incremental mode with context-sensitive text (e.g. greek sigma)
     fMap(map)
 {
     // TODO test incremental mode with context-sensitive text (e.g. greek sigma)


@@ -108,7 +109,7 @@ CaseMapTransliterator::~CaseMapTransliterator() {
  */
 CaseMapTransliterator::CaseMapTransliterator(const CaseMapTransliterator& o) :
     Transliterator(o),
  */
 CaseMapTransliterator::CaseMapTransliterator(const CaseMapTransliterator& o) :
     Transliterator(o),

-    fCsp(o.fCsp), fMap(o.fMap)
+    fMap(o.fMap)

 {
 }
 
 {
 }
 


@@ -117,7 +118,6 @@ CaseMapTransliterator::CaseMapTransliterator(const CaseMapTransliterator& o) :
  */
 /*CaseMapTransliterator& CaseMapTransliterator::operator=(const CaseMapTransliterator& o) {
     Transliterator::operator=(o);
  */
 /*CaseMapTransliterator& CaseMapTransliterator::operator=(const CaseMapTransliterator& o) {
     Transliterator::operator=(o);

-    fCsp = o.fCsp;

     fMap = o.fMap;
     return *this;
 }*/
     fMap = o.fMap;
     return *this;
 }*/


@@ -125,7 +125,7 @@ CaseMapTransliterator::CaseMapTransliterator(const CaseMapTransliterator& o) :
 /**
  * Transliterator API.
  */
 /**
  * Transliterator API.
  */

-/*Transliterator* CaseMapTransliterator::clone(void) const {
+/*CaseMapTransliterator* CaseMapTransliterator::clone() const {

     return new CaseMapTransliterator(*this);
 }*/
 
     return new CaseMapTransliterator(*this);
 }*/
 


@@ -149,14 +149,14 @@ void CaseMapTransliterator::handleTransliterate(Replaceable& text,
     UnicodeString tmp;
     const UChar *s;
     UChar32 c;
     UnicodeString tmp;
     const UChar *s;
     UChar32 c;

-    int32_t textPos, delta, result, locCache=0;
+    int32_t textPos, delta, result;

 
     for(textPos=offsets.start; textPos<offsets.limit;) {
         csc.cpStart=textPos;
         c=text.char32At(textPos);
         csc.cpLimit=textPos+=U16_LENGTH(c);
 
 
     for(textPos=offsets.start; textPos<offsets.limit;) {
         csc.cpStart=textPos;
         c=text.char32At(textPos);
         csc.cpLimit=textPos+=U16_LENGTH(c);
 

-        result=fMap(fCsp, c, utrans_rep_caseContextIterator, &csc, &s, "", &locCache);
+        result=fMap(c, utrans_rep_caseContextIterator, &csc, &s, UCASE_LOC_ROOT);

 
         if(csc.b1 && isIncremental) {
             // fMap() tried to look beyond the context limit
 
         if(csc.b1 && isIncremental) {
             // fMap() tried to look beyond the context limit