organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-170 fix findAndReplace()

Browse source 
X-SVN-Rev: 330
This commit is contained in:
Markus Scherer 1999-12-07 03:22:12 +00:00
parent 5eaf91b840
commit 1d4baa47fb
2 changed files with 58 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
icu4c/source/common/unistr.cpp
View file

@ -510,6 +510,44 @@ UnicodeString::doLastIndexOf(UChar c,
return -1;
}
UnicodeString&
UnicodeString::findAndReplace(UTextOffset start,
int32_t length,
const UnicodeString& oldText,
UTextOffset oldStart,
int32_t oldLength,
const UnicodeString& newText,
UTextOffset newStart,
int32_t newLength)
{
if(isBogus() || oldText.isBogus() || newText.isBogus()) {
return *this;
}
pinIndices(start, length);
oldText.pinIndices(oldStart, oldLength);
newText.pinIndices(newStart, newLength);
if(oldLength == 0 || newLength == 0) {
return *this;
}
while(length >= oldLength) {
UTextOffset pos = indexOf(oldText, oldStart, oldLength, start, length);
if(pos < 0) {
// no more oldText's here: done
break;
} else {
// we found oldText, replace it by newText and go beyond it
replace(pos, oldLength, newText, newStart, newLength);
length -= pos + oldLength - start;
start = pos + newLength;
}
}
return *this;
}
//========================================
// Write implementation
@ -704,16 +742,17 @@ UnicodeString::doReplace( UTextOffset start,
UTextOffset srcStart,
int32_t srcLength)
{
// pin the indices to legal values
src.pinIndices(srcStart, srcLength);
if(!src.isBogus()) {
// pin the indices to legal values
src.pinIndices(srcStart, srcLength);
// get the characters from src
const UChar *chars = src.getArrayStart();
// and replace the range in ourselves with them
doReplace(start, length, chars, srcStart, srcLength);
return *this;
// get the characters from src
// and replace the range in ourselves with them
return doReplace(start, length, src.getArrayStart(), srcStart, srcLength);
} else {
// remove the range
return doReplace(start, length, 0, 0, 0);
}
}
UnicodeString&
@ -727,6 +766,10 @@ UnicodeString::doReplace(UTextOffset start,
if(fBogus)
return *this;
if(srcChars == 0) {
srcStart = srcLength = 0;
}
bool_t deleteWhenDone = FALSE;
UChar *bufferToDelete = 0;
@ -779,9 +822,11 @@ UnicodeString::doReplace(UTextOffset start,
// now do the replace
// first copy the portion that isn't changing, leaving a hole
us_arrayCopy(getArrayStart(), start + length,
getArrayStart(), start + srcLength,
fLength - (start + length));
if(length != srcLength) {
us_arrayCopy(getArrayStart(), start + length,
getArrayStart(), start + srcLength,
fLength - (start + length));
}
// now fill in the hole with the new string
us_arrayCopy(srcChars, srcStart, getArrayStart(), start, srcLength);

25
icu4c/source/common/unistr.h
View file

@ -1162,7 +1162,7 @@ public:
* @param newLength the length of the replacement range in <TT>newText</TT>
* @return a reference to this
*/
inline UnicodeString& findAndReplace(UTextOffset start,
UnicodeString& findAndReplace(UTextOffset start,
int32_t length,
const UnicodeString& oldText,
UTextOffset oldStart,
@ -1930,29 +1930,6 @@ UnicodeString::findAndReplace(UTextOffset start,
{ return findAndReplace(start, length, oldText, 0, oldText.fLength,
newText, 0, newText.fLength); }
inline UnicodeString&
UnicodeString::findAndReplace(UTextOffset start,
int32_t length,
const UnicodeString& oldText,
UTextOffset oldStart,
int32_t oldLength,
const UnicodeString& newText,
UTextOffset newStart,
int32_t newLength)
{
UTextOffset pos;
for(UTextOffset i = start; i < start + length; ++i) {
pos = indexOf(oldText, oldStart, oldLength, i, length - i + start);
if(pos != -1) {
replace(pos, oldLength, newText, newStart, newLength);
i += newLength;
}
}
return *this;
}
// ============================
// extract
// ============================