/*
******************************************************************************
-* Copyright (C) 1999-2004, International Business Machines Corporation and *
+* Copyright (C) 1999-2008, International Business Machines Corporation and *
* others. All Rights Reserved. *
******************************************************************************
*
U_CDECL_BEGIN
static UChar U_CALLCONV
UnicodeString_charAt(int32_t offset, void *context) {
- return ((UnicodeString*) context)->charAt(offset);
+ return ((U_NAMESPACE_QUALIFIER UnicodeString*) context)->charAt(offset);
}
U_CDECL_END
void
UnicodeString::addRef()
-{ umtx_atomic_inc((int32_t *)fArray - 1);}
+{ umtx_atomic_inc((int32_t *)fUnion.fFields.fArray - 1);}
int32_t
UnicodeString::removeRef()
-{ return umtx_atomic_dec((int32_t *)fArray - 1);}
+{ return umtx_atomic_dec((int32_t *)fUnion.fFields.fArray - 1);}
int32_t
UnicodeString::refCount() const
umtx_lock(NULL);
// Note: without the lock to force a memory barrier, we might see a very
// stale value on some multi-processor systems.
- int32_t count = *((int32_t *)fArray - 1);
+ int32_t count = *((int32_t *)fUnion.fFields.fArray - 1);
umtx_unlock(NULL);
return count;
}
void
UnicodeString::releaseArray() {
if((fFlags & kRefCounted) && removeRef() == 0) {
- uprv_free((int32_t *)fArray - 1);
+ uprv_free((int32_t *)fUnion.fFields.fArray - 1);
}
}
// Constructors
//========================================
UnicodeString::UnicodeString()
- : fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ : fShortLength(0),
fFlags(kShortString)
{}
UnicodeString::UnicodeString(int32_t capacity, UChar32 c, int32_t count)
- : fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(0),
+ : fShortLength(0),
fFlags(0)
{
if(count <= 0 || (uint32_t)c > 0x10ffff) {
capacity = length;
}
if(allocate(capacity)) {
+ UChar *array = getArrayStart();
int32_t i = 0;
// fill the new string with c
if(unitCount == 1) {
// fill with length UChars
while(i < length) {
- fArray[i++] = (UChar)c;
+ array[i++] = (UChar)c;
}
} else {
// get the code units for c
while(i < length) {
int32_t unitIdx = 0;
while(unitIdx < unitCount) {
- fArray[i++]=units[unitIdx++];
+ array[i++]=units[unitIdx++];
}
}
}
}
- fLength = length;
+ setLength(length);
}
}
UnicodeString::UnicodeString(UChar ch)
- : fLength(1),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ : fShortLength(1),
fFlags(kShortString)
{
- fStackBuffer[0] = ch;
+ fUnion.fStackBuffer[0] = ch;
}
UnicodeString::UnicodeString(UChar32 ch)
- : fLength(1),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ : fShortLength(0),
fFlags(kShortString)
{
int32_t i = 0;
UBool isError = FALSE;
- U16_APPEND(fStackBuffer, i, US_STACKBUF_SIZE, ch, isError);
- fLength = i;
+ U16_APPEND(fUnion.fStackBuffer, i, US_STACKBUF_SIZE, ch, isError);
+ fShortLength = (int8_t)i;
}
UnicodeString::UnicodeString(const UChar *text)
- : fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ : fShortLength(0),
fFlags(kShortString)
{
doReplace(0, 0, text, 0, -1);
UnicodeString::UnicodeString(const UChar *text,
int32_t textLength)
- : fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ : fShortLength(0),
fFlags(kShortString)
{
doReplace(0, 0, text, 0, textLength);
UnicodeString::UnicodeString(UBool isTerminated,
const UChar *text,
int32_t textLength)
- : fLength(textLength),
- fCapacity(isTerminated ? textLength + 1 : textLength),
- fArray((UChar *)text),
+ : fShortLength(0),
fFlags(kReadonlyAlias)
{
if(text == NULL) {
// treat as an empty string, do not alias
- fLength = 0;
- fCapacity = US_STACKBUF_SIZE;
- fArray = fStackBuffer;
- fFlags = kShortString;
+ setToEmpty();
} else if(textLength < -1 ||
(textLength == -1 && !isTerminated) ||
(textLength >= 0 && isTerminated && text[textLength] != 0)
) {
setToBogus();
- } else if(textLength == -1) {
- // text is terminated, or else it would have failed the above test
- fLength = u_strlen(text);
- fCapacity = fLength + 1;
+ } else {
+ if(textLength == -1) {
+ // text is terminated, or else it would have failed the above test
+ textLength = u_strlen(text);
+ }
+ setArray((UChar *)text, textLength, isTerminated ? textLength + 1 : textLength);
}
}
UnicodeString::UnicodeString(UChar *buff,
int32_t buffLength,
int32_t buffCapacity)
- : fLength(buffLength),
- fCapacity(buffCapacity),
- fArray(buff),
+ : fShortLength(0),
fFlags(kWritableAlias)
{
if(buff == NULL) {
// treat as an empty string, do not alias
- fLength = 0;
- fCapacity = US_STACKBUF_SIZE;
- fArray = fStackBuffer;
- fFlags = kShortString;
+ setToEmpty();
} else if(buffLength < -1 || buffCapacity < 0 || buffLength > buffCapacity) {
setToBogus();
- } else if(buffLength == -1) {
- // fLength = u_strlen(buff); but do not look beyond buffCapacity
- const UChar *p = buff, *limit = buff + buffCapacity;
- while(p != limit && *p != 0) {
- ++p;
+ } else {
+ if(buffLength == -1) {
+ // fLength = u_strlen(buff); but do not look beyond buffCapacity
+ const UChar *p = buff, *limit = buff + buffCapacity;
+ while(p != limit && *p != 0) {
+ ++p;
+ }
+ buffLength = (int32_t)(p - buff);
}
- fLength = (int32_t)(p - buff);
+ setArray(buff, buffLength, buffCapacity);
}
}
UnicodeString::UnicodeString(const char *src, int32_t length, EInvariant)
- : fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ : fShortLength(0),
fFlags(kShortString)
{
if(src==NULL) {
// treat as an empty string
} else {
if(length<0) {
- length=uprv_strlen(src);
+ length=(int32_t)uprv_strlen(src);
}
if(cloneArrayIfNeeded(length, length, FALSE)) {
u_charsToUChars(src, getArrayStart(), length);
- fLength = length;
+ setLength(length);
} else {
setToBogus();
}
UnicodeString::UnicodeString(const UnicodeString& that)
: Replaceable(),
- fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ fShortLength(0),
fFlags(kShortString)
{
copyFrom(that);
UnicodeString::UnicodeString(const UnicodeString& that,
int32_t srcStart)
: Replaceable(),
- fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ fShortLength(0),
fFlags(kShortString)
{
setTo(that, srcStart);
int32_t srcStart,
int32_t srcLength)
: Replaceable(),
- fLength(0),
- fCapacity(US_STACKBUF_SIZE),
- fArray(fStackBuffer),
+ fShortLength(0),
fFlags(kShortString)
{
setTo(that, srcStart, srcLength);
UBool
UnicodeString::allocate(int32_t capacity) {
if(capacity <= US_STACKBUF_SIZE) {
- fArray = fStackBuffer;
- fCapacity = US_STACKBUF_SIZE;
fFlags = kShortString;
} else {
// count bytes for the refCounter and the string capacity, and
*array++ = 1;
// have fArray point to the first UChar
- fArray = (UChar *)array;
- fCapacity = (int32_t)((words - 1) * (sizeof(int32_t) / U_SIZEOF_UCHAR));
+ fUnion.fFields.fArray = (UChar *)array;
+ fUnion.fFields.fCapacity = (int32_t)((words - 1) * (sizeof(int32_t) / U_SIZEOF_UCHAR));
fFlags = kLongString;
} else {
- fLength = 0;
- fCapacity = 0;
+ fShortLength = 0;
+ fUnion.fFields.fArray = 0;
+ fUnion.fFields.fCapacity = 0;
fFlags = kIsBogus;
return FALSE;
}
// delete the current contents
releaseArray();
- // we always copy the length
- fLength = src.fLength;
- if(fLength == 0) {
+ if(src.isEmpty()) {
// empty string - use the stack buffer
- fArray = fStackBuffer;
- fCapacity = US_STACKBUF_SIZE;
- fFlags = kShortString;
+ setToEmpty();
return *this;
}
+ // we always copy the length
+ int32_t srcLength = src.length();
+ setLength(srcLength);
+
// fLength>0 and not an "open" src.getBuffer(minCapacity)
switch(src.fFlags) {
case kShortString:
// short string using the stack buffer, do the same
- fArray = fStackBuffer;
- fCapacity = US_STACKBUF_SIZE;
fFlags = kShortString;
- uprv_memcpy(fStackBuffer, src.fArray, fLength * U_SIZEOF_UCHAR);
+ uprv_memcpy(fUnion.fStackBuffer, src.fUnion.fStackBuffer, fShortLength * U_SIZEOF_UCHAR);
break;
case kLongString:
// src uses a refCounted string buffer, use that buffer with refCount
// src is const, use a cast - we don't really change it
((UnicodeString &)src).addRef();
// copy all fields, share the reference-counted buffer
- fArray = src.fArray;
- fCapacity = src.fCapacity;
+ fUnion.fFields.fArray = src.fUnion.fFields.fArray;
+ fUnion.fFields.fCapacity = src.fUnion.fFields.fCapacity;
fFlags = src.fFlags;
break;
case kReadonlyAlias:
if(fastCopy) {
// src is a readonly alias, do the same
// -> maintain the readonly alias as such
- fArray = src.fArray;
- fCapacity = src.fCapacity;
+ fUnion.fFields.fArray = src.fUnion.fFields.fArray;
+ fUnion.fFields.fCapacity = src.fUnion.fFields.fCapacity;
fFlags = src.fFlags;
break;
}
// -> allocate a new buffer and copy the contents
case kWritableAlias:
// src is a writable alias; we make a copy of that instead
- if(allocate(fLength)) {
- uprv_memcpy(fArray, src.fArray, fLength * U_SIZEOF_UCHAR);
+ if(allocate(srcLength)) {
+ uprv_memcpy(getArrayStart(), src.getArrayStart(), srcLength * U_SIZEOF_UCHAR);
break;
}
// if there is not enough memory, then fall through to setting to bogus
default:
// if src is bogus, set ourselves to bogus
// do not call setToBogus() here because fArray and fFlags are not consistent here
- fArray = 0;
- fLength = 0;
- fCapacity = 0;
+ fShortLength = 0;
+ fUnion.fFields.fArray = 0;
+ fUnion.fFields.fCapacity = 0;
fFlags = kIsBogus;
break;
}
//========================================
UnicodeString UnicodeString::unescape() const {
- UnicodeString result;
- for (int32_t i=0; i<length(); ) {
- UChar32 c = charAt(i++);
- if (c == 0x005C /*'\\'*/) {
- c = unescapeAt(i); // advances i
- if (c == (UChar32)0xFFFFFFFF) {
+ UnicodeString result(length(), (UChar32)0, (int32_t)0); // construct with capacity
+ const UChar *array = getBuffer();
+ int32_t len = length();
+ int32_t prev = 0;
+ for (int32_t i=0;;) {
+ if (i == len) {
+ result.append(array, prev, len - prev);
+ break;
+ }
+ if (array[i++] == 0x5C /*'\\'*/) {
+ result.append(array, prev, (i - 1) - prev);
+ UChar32 c = unescapeAt(i); // advances i
+ if (c < 0) {
result.remove(); // return empty string
break; // invalid escape sequence
}
+ result.append(c);
+ prev = i;
}
- result.append(c);
}
return result;
}
srcStart = srcLength = 0;
}
- int32_t diff = uprv_strCompare(fArray + start, length, srcChars + srcStart, srcLength, FALSE, TRUE);
+ int32_t diff = uprv_strCompare(getArrayStart() + start, length, srcChars + srcStart, srcLength, FALSE, TRUE);
/* translate the 32-bit result into an 8-bit one */
if(diff!=0) {
return (int8_t)(diff >> 15 | 1);
UnicodeString::countChar32(int32_t start, int32_t length) const {
pinIndices(start, length);
// if(isBogus()) then fArray==0 and start==0 - u_countChar32() checks for NULL
- return u_countChar32(fArray+start, length);
+ return u_countChar32(getArrayStart()+start, length);
}
UBool
UnicodeString::hasMoreChar32Than(int32_t start, int32_t length, int32_t number) const {
pinIndices(start, length);
// if(isBogus()) then fArray==0 and start==0 - u_strHasMoreChar32Than() checks for NULL
- return u_strHasMoreChar32Than(fArray+start, length, number);
+ return u_strHasMoreChar32Than(getArrayStart()+start, length, number);
}
int32_t
UnicodeString::moveIndex32(int32_t index, int32_t delta) const {
// pin index
+ int32_t len = length();
if(index<0) {
index=0;
- } else if(index>fLength) {
- index=fLength;
+ } else if(index>len) {
+ index=len;
}
+ const UChar *array = getArrayStart();
if(delta>0) {
- UTF_FWD_N(fArray, index, fLength, delta);
+ UTF_FWD_N(array, index, len, delta);
} else {
- UTF_BACK_N(fArray, 0, index, -delta);
+ UTF_BACK_N(array, 0, index, -delta);
}
return index;
pinIndices(start, length);
// do not copy anything if we alias dst itself
- if(fArray + start != dst + dstStart) {
- us_arrayCopy(getArrayStart(), start, dst, dstStart, length);
+ const UChar *array = getArrayStart();
+ if(array + start != dst + dstStart) {
+ us_arrayCopy(array, start, dst, dstStart, length);
}
}
int32_t
UnicodeString::extract(UChar *dest, int32_t destCapacity,
UErrorCode &errorCode) const {
+ int32_t len = length();
if(U_SUCCESS(errorCode)) {
if(isBogus() || destCapacity<0 || (destCapacity>0 && dest==0)) {
errorCode=U_ILLEGAL_ARGUMENT_ERROR;
} else {
- if(fLength>0 && fLength<=destCapacity && fArray!=dest) {
- uprv_memcpy(dest, fArray, fLength*U_SIZEOF_UCHAR);
+ const UChar *array = getArrayStart();
+ if(len>0 && len<=destCapacity && array!=dest) {
+ uprv_memcpy(dest, array, len*U_SIZEOF_UCHAR);
}
- return u_terminateUChars(dest, destCapacity, fLength, &errorCode);
+ return u_terminateUChars(dest, destCapacity, len, &errorCode);
}
}
- return fLength;
+ return len;
}
int32_t
pinIndices(start, length);
// find the first occurrence of the substring
- const UChar *match = u_strFindFirst(fArray + start, length, srcChars + srcStart, srcLength);
+ const UChar *array = getArrayStart();
+ const UChar *match = u_strFindFirst(array + start, length, srcChars + srcStart, srcLength);
if(match == NULL) {
return -1;
} else {
- return match - fArray;
+ return (int32_t)(match - array);
}
}
pinIndices(start, length);
// find the first occurrence of c
- const UChar *match = u_memchr(fArray + start, c, length);
+ const UChar *array = getArrayStart();
+ const UChar *match = u_memchr(array + start, c, length);
if(match == NULL) {
return -1;
} else {
- return match - fArray;
+ return (int32_t)(match - array);
}
}
pinIndices(start, length);
// find the first occurrence of c
- const UChar *match = u_memchr32(fArray + start, c, length);
+ const UChar *array = getArrayStart();
+ const UChar *match = u_memchr32(array + start, c, length);
if(match == NULL) {
return -1;
} else {
- return match - fArray;
+ return (int32_t)(match - array);
}
}
pinIndices(start, length);
// find the last occurrence of the substring
- const UChar *match = u_strFindLast(fArray + start, length, srcChars + srcStart, srcLength);
+ const UChar *array = getArrayStart();
+ const UChar *match = u_strFindLast(array + start, length, srcChars + srcStart, srcLength);
if(match == NULL) {
return -1;
} else {
- return match - fArray;
+ return (int32_t)(match - array);
}
}
pinIndices(start, length);
// find the last occurrence of c
- const UChar *match = u_memrchr(fArray + start, c, length);
+ const UChar *array = getArrayStart();
+ const UChar *match = u_memrchr(array + start, c, length);
if(match == NULL) {
return -1;
} else {
- return match - fArray;
+ return (int32_t)(match - array);
}
}
pinIndices(start, length);
// find the last occurrence of c
- const UChar *match = u_memrchr32(fArray + start, c, length);
+ const UChar *array = getArrayStart();
+ const UChar *match = u_memrchr32(array + start, c, length);
if(match == NULL) {
return -1;
} else {
- return match - fArray;
+ return (int32_t)(match - array);
}
}
{
releaseArray();
- fArray = 0;
- fCapacity = fLength = 0;
+ fShortLength = 0;
+ fUnion.fFields.fArray = 0;
+ fUnion.fFields.fCapacity = 0;
fFlags = kIsBogus;
}
void
UnicodeString::unBogus() {
if(fFlags & kIsBogus) {
- fArray = fStackBuffer;
- fLength = 0;
- fCapacity = US_STACKBUF_SIZE;
- fFlags = kShortString;
+ setToEmpty();
}
}
if(text == NULL) {
// treat as an empty string, do not alias
releaseArray();
- fLength = 0;
- fCapacity = US_STACKBUF_SIZE;
- fArray = fStackBuffer;
- fFlags = kShortString;
+ setToEmpty();
return *this;
}
releaseArray();
- fArray = (UChar *)text;
- if(textLength != -1) {
- fLength = textLength;
- fCapacity = isTerminated ? fLength + 1 : fLength;
- } else {
+ if(textLength == -1) {
// text is terminated, or else it would have failed the above test
- fLength = u_strlen(text);
- fCapacity = fLength + 1;
+ textLength = u_strlen(text);
}
+ setArray((UChar *)text, textLength, isTerminated ? textLength + 1 : textLength);
fFlags = kReadonlyAlias;
return *this;
if(buffer == NULL) {
// treat as an empty string, do not alias
releaseArray();
- fLength = 0;
- fCapacity = US_STACKBUF_SIZE;
- fArray = fStackBuffer;
- fFlags = kShortString;
+ setToEmpty();
return *this;
}
releaseArray();
- fArray = buffer;
- fLength = buffLength;
- fCapacity = buffCapacity;
+ setArray(buffer, buffLength, buffCapacity);
fFlags = kWritableAlias;
return *this;
}
UnicodeString::setCharAt(int32_t offset,
UChar c)
{
- if(cloneArrayIfNeeded() && fLength > 0) {
+ int32_t len = length();
+ if(cloneArrayIfNeeded() && len > 0) {
if(offset < 0) {
offset = 0;
- } else if(offset >= fLength) {
- offset = fLength - 1;
+ } else if(offset >= len) {
+ offset = len - 1;
}
- fArray[offset] = c;
+ getArrayStart()[offset] = c;
}
return *this;
}
int32_t srcStart,
int32_t srcLength)
{
- if(isBogus()) {
+ if(!isWritable()) {
return *this;
}
srcLength = u_strlen(srcChars + srcStart);
}
- int32_t *bufferToDelete = 0;
+ int32_t oldLength = this->length();
- // the following may change fArray but will not copy the current contents;
- // therefore we need to keep the current fArray
- UChar *oldArray = fArray;
- int32_t oldLength = fLength;
+ // calculate the size of the string after the replace
+ int32_t newSize;
+
+ // optimize append() onto a large-enough, owned string
+ if(start >= oldLength) {
+ newSize = oldLength + srcLength;
+ if(newSize <= getCapacity() && isBufferWritable()) {
+ us_arrayCopy(srcChars, srcStart, getArrayStart(), oldLength, srcLength);
+ setLength(newSize);
+ return *this;
+ } else {
+ // pin the indices to legal values
+ start = oldLength;
+ length = 0;
+ }
+ } else {
+ // pin the indices to legal values
+ pinIndices(start, length);
- // pin the indices to legal values
- pinIndices(start, length);
+ newSize = oldLength - length + srcLength;
+ }
- // calculate the size of the string after the replace
- int32_t newSize = oldLength - length + srcLength;
+ // the following may change fArray but will not copy the current contents;
+ // therefore we need to keep the current fArray
+ UChar oldStackBuffer[US_STACKBUF_SIZE];
+ UChar *oldArray;
+ if((fFlags&kUsingStackBuffer) && (newSize > US_STACKBUF_SIZE)) {
+ // copy the stack buffer contents because it will be overwritten with
+ // fUnion.fFields values
+ u_memcpy(oldStackBuffer, fUnion.fStackBuffer, oldLength);
+ oldArray = oldStackBuffer;
+ } else {
+ oldArray = getArrayStart();
+ }
// clone our array and allocate a bigger array if needed
+ int32_t *bufferToDelete = 0;
if(!cloneArrayIfNeeded(newSize, newSize + (newSize >> 2) + kGrowSize,
FALSE, &bufferToDelete)
) {
// now do the replace
- if(fArray != oldArray) {
+ UChar *newArray = getArrayStart();
+ if(newArray != oldArray) {
// if fArray changed, then we need to copy everything except what will change
- us_arrayCopy(oldArray, 0, fArray, 0, start);
+ us_arrayCopy(oldArray, 0, newArray, 0, start);
us_arrayCopy(oldArray, start + length,
- fArray, start + srcLength,
+ newArray, start + srcLength,
oldLength - (start + length));
} else if(length != srcLength) {
// fArray did not change; copy only the portion that isn't changing, leaving a hole
us_arrayCopy(oldArray, start + length,
- fArray, start + srcLength,
+ newArray, start + srcLength,
oldLength - (start + length));
}
// now fill in the hole with the new string
- us_arrayCopy(srcChars, srcStart, getArrayStart(), start, srcLength);
+ us_arrayCopy(srcChars, srcStart, newArray, start, srcLength);
- fLength = newSize;
+ setLength(newSize);
// delayed delete in case srcChars == fArray when we started, and
// to keep oldArray alive for the above operations
return; // Nothing to do; avoid bogus malloc call
}
UChar* text = (UChar*) uprv_malloc( sizeof(UChar) * (limit - start) );
- extractBetween(start, limit, text, 0);
- insert(dest, text, 0, limit - start);
- uprv_free(text);
+ // Check to make sure text is not null.
+ if (text != NULL) {
+ extractBetween(start, limit, text, 0);
+ insert(dest, text, 0, limit - start);
+ uprv_free(text);
+ }
}
/**
UnicodeString::doReverse(int32_t start,
int32_t length)
{
- if(fLength <= 1 || !cloneArrayIfNeeded()) {
+ if(this->length() <= 1 || !cloneArrayIfNeeded()) {
return *this;
}
pinIndices(start, length);
UChar *left = getArrayStart() + start;
- UChar *right = getArrayStart() + start + length;
+ UChar *right = left + length;
UChar swap;
UBool hasSupplementary = FALSE;
UChar swap2;
left = getArrayStart() + start;
- right = getArrayStart() + start + length - 1; // -1 so that we can look at *(left+1) if left<right
+ right = left + length - 1; // -1 so that we can look at *(left+1) if left<right
while(left < right) {
if(UTF_IS_TRAIL(swap = *left) && UTF_IS_LEAD(swap2 = *(left + 1))) {
*left++ = swap2;
UnicodeString::padLeading(int32_t targetLength,
UChar padChar)
{
- if(fLength >= targetLength || !cloneArrayIfNeeded(targetLength)) {
+ int32_t oldLength = length();
+ if(oldLength >= targetLength || !cloneArrayIfNeeded(targetLength)) {
return FALSE;
} else {
// move contents up by padding width
- int32_t start = targetLength - fLength;
- us_arrayCopy(fArray, 0, fArray, start, fLength);
+ UChar *array = getArrayStart();
+ int32_t start = targetLength - oldLength;
+ us_arrayCopy(array, 0, array, start, oldLength);
// fill in padding character
while(--start >= 0) {
- fArray[start] = padChar;
+ array[start] = padChar;
}
- fLength = targetLength;
+ setLength(targetLength);
return TRUE;
}
}
UnicodeString::padTrailing(int32_t targetLength,
UChar padChar)
{
- if(fLength >= targetLength || !cloneArrayIfNeeded(targetLength)) {
+ int32_t oldLength = length();
+ if(oldLength >= targetLength || !cloneArrayIfNeeded(targetLength)) {
return FALSE;
} else {
// fill in padding character
+ UChar *array = getArrayStart();
int32_t length = targetLength;
- while(--length >= fLength) {
- fArray[length] = padChar;
+ while(--length >= oldLength) {
+ array[length] = padChar;
}
- fLength = targetLength;
+ setLength(targetLength);
return TRUE;
}
}
{
/* Delegate hash computation to uhash. This makes UnicodeString
* hashing consistent with UChar* hashing. */
- int32_t hashCode = uhash_hashUCharsN(getArrayStart(), fLength);
+ int32_t hashCode = uhash_hashUCharsN(getArrayStart(), length());
if (hashCode == kInvalidHashCode) {
hashCode = kEmptyHashCode;
}
UnicodeString::getBuffer(int32_t minCapacity) {
if(minCapacity>=-1 && cloneArrayIfNeeded(minCapacity)) {
fFlags|=kOpenGetBuffer;
- fLength=0;
- return fArray;
+ fShortLength=0;
+ return getArrayStart();
} else {
return 0;
}
UnicodeString::releaseBuffer(int32_t newLength) {
if(fFlags&kOpenGetBuffer && newLength>=-1) {
// set the new fLength
+ int32_t capacity=getCapacity();
if(newLength==-1) {
// the new length is the string length, capped by fCapacity
- const UChar *p=fArray, *limit=fArray+fCapacity;
+ const UChar *array=getArrayStart(), *p=array, *limit=array+capacity;
while(p<limit && *p!=0) {
++p;
}
- fLength=(int32_t)(p-fArray);
- } else if(newLength<=fCapacity) {
- fLength=newLength;
- } else {
- fLength=fCapacity;
+ newLength=(int32_t)(p-array);
+ } else if(newLength>capacity) {
+ newLength=capacity;
}
+ setLength(newLength);
fFlags&=~kOpenGetBuffer;
}
}
// default parameters need to be static, therefore
// the defaults are -1 to have convenience defaults
if(newCapacity == -1) {
- newCapacity = fCapacity;
+ newCapacity = getCapacity();
}
// while a getBuffer(minCapacity) is "open",
// prevent any modifications of the string by returning FALSE here
// if the string is bogus, then only an assignment or similar can revive it
- if((fFlags&(kOpenGetBuffer|kIsBogus))!=0) {
+ if(!isWritable()) {
return FALSE;
}
if(forceClone ||
fFlags & kBufferIsReadonly ||
fFlags & kRefCounted && refCount() > 1 ||
- newCapacity > fCapacity
+ newCapacity > getCapacity()
) {
- // save old values
- UChar *array = fArray;
- uint16_t flags = fFlags;
-
// check growCapacity for default value and use of the stack buffer
if(growCapacity == -1) {
growCapacity = newCapacity;
growCapacity = US_STACKBUF_SIZE;
}
+ // save old values
+ UChar oldStackBuffer[US_STACKBUF_SIZE];
+ UChar *oldArray;
+ uint8_t flags = fFlags;
+
+ if(flags&kUsingStackBuffer) {
+ if(doCopyArray && growCapacity > US_STACKBUF_SIZE) {
+ // copy the stack buffer contents because it will be overwritten with
+ // fUnion.fFields values
+ us_arrayCopy(fUnion.fStackBuffer, 0, oldStackBuffer, 0, fShortLength);
+ oldArray = oldStackBuffer;
+ } else {
+ oldArray = 0; // no need to copy from stack buffer to itself
+ }
+ } else {
+ oldArray = fUnion.fFields.fArray;
+ }
+
// allocate a new array
if(allocate(growCapacity) ||
newCapacity < growCapacity && allocate(newCapacity)
) {
- if(doCopyArray) {
+ if(doCopyArray && oldArray != 0) {
// copy the contents
// do not copy more than what fits - it may be smaller than before
- if(fCapacity < fLength) {
- fLength = fCapacity;
+ int32_t minLength = length();
+ newCapacity = getCapacity();
+ if(newCapacity < minLength) {
+ minLength = newCapacity;
+ setLength(minLength);
}
- us_arrayCopy(array, 0, fArray, 0, fLength);
+ us_arrayCopy(oldArray, 0, getArrayStart(), 0, minLength);
} else {
- fLength = 0;
+ fShortLength = 0;
}
// release the old array
if(flags & kRefCounted) {
// the array is refCounted; decrement and release if 0
- int32_t *pRefCount = ((int32_t *)array - 1);
+ int32_t *pRefCount = ((int32_t *)oldArray - 1);
if(umtx_atomic_dec(pRefCount) == 0) {
if(pBufferToDelete == 0) {
uprv_free(pRefCount);
} else {
// not enough memory for growCapacity and not even for the smaller newCapacity
// reset the old values for setToBogus() to release the array
- fArray = array;
+ if(!(flags&kUsingStackBuffer)) {
+ fUnion.fFields.fArray = oldArray;
+ }
fFlags = flags;
setToBogus();
return FALSE;
return TRUE;
}
U_NAMESPACE_END
+
+#ifdef U_STATIC_IMPLEMENTATION
+/*
+This should never be called. It is defined here to make sure that the
+virtual vector deleting destructor is defined within unistr.cpp.
+The vector deleting destructor is already a part of UObject,
+but defining it here makes sure that it is included with this object file.
+This makes sure that static library dependencies are kept to a minimum.
+*/
+static void uprv_UnicodeStringDummy(void) {
+ U_NAMESPACE_USE
+ delete [] (new UnicodeString[2]);
+}
+#endif
+
projects / apple / icu.git / blobdiff