More functions and bug fixes, and lot of code from Marc Flerackers

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1001 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2002-09-09 06:50:28 +00:00
parent 72e8e64eea
commit 7c830dc497
+468 -84
View File
@@ -1,39 +1,77 @@
//------------------------------------------------------------------------------
// Copyright (c) 2001-2002, OpenBeOS
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// File Name: String.cpp
// Author(s): Marc Flerackers ([email protected])
// Stefano Ceccherini ([email protected])
//
// Description: String class supporting common string operations.
//------------------------------------------------------------------------------
// Standard Includes -----------------------------------------------------------
#include <algobase.h>
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
// System Includes -------------------------------------------------------------
#include <String.h>
#include <cstdlib>
#include <cctype>
BString::BString()
BString::BString()
:_privateData(NULL)
{
_Init(NULL, 0);
}
BString::BString(const char* string)
BString::BString(const char* str)
:_privateData(NULL)
{
_Init(string, strlen(string));
if (str)
_Init(str, strlen(str));
}
BString::BString(const BString &string)
BString::BString(const BString &string)
:_privateData(NULL)
{
_Init(string.String(), string.Length());
}
BString::BString(const char *string, int32 maxLength)
BString::BString(const char *str, int32 maxLength)
:_privateData(NULL)
{
int32 stringLen = strlen(string);
int32 len = (maxLength <= stringLen ? maxLength : stringLen);
_Init(string, len);
if (str) {
int32 len = min(maxLength, (int32)strlen(str));
_Init(str, len);
}
}
BString::~BString()
{
if (_privateData) {
_privateData -= sizeof(int32);
free(_privateData);
}
if (_privateData)
free(_privateData - sizeof(int32));
}
@@ -41,7 +79,18 @@ BString::~BString()
int32
BString::CountChars() const
{
return 0; //TODO: Implement
int32 count = 0;
char *ptr = _privateData;
while (*ptr++)
{
count++;
// Jump to next UTF8 character
for (; (*ptr & 0xc0) == 0x80; ptr++);
}
return count;
}
@@ -55,9 +104,10 @@ BString::operator=(const BString &string)
BString&
BString::operator=(const char *string)
BString::operator=(const char *str)
{
_DoAssign(string, strlen(string));
if (str)
_DoAssign(str, strlen(str));
return *this;
}
@@ -65,19 +115,16 @@ BString::operator=(const char *string)
BString&
BString::operator=(char c)
{
char *tmp = (char*)calloc(2, sizeof(char));
tmp[0] = c;
_DoAssign(tmp, 1);
free(tmp);
_DoAssign(&c, 1);
return *this;
}
BString&
BString::SetTo(const char *string, int32 length)
BString::SetTo(const char *str, int32 length)
{
_DoAssign(string, length);
if (str)
_DoAssign(str, min(length, (int32)strlen(str)));
return *this;
}
@@ -85,7 +132,7 @@ BString::SetTo(const char *string, int32 length)
BString&
BString::SetTo(const BString &from)
{
SetTo(from.String(), from.Length());
_DoAssign(from.String(), from.Length());
return *this;
}
@@ -93,7 +140,12 @@ BString::SetTo(const BString &from)
BString&
BString::Adopt(BString &from)
{
//TODO: implement
if (_privateData)
free(_privateData - sizeof(int32));
_privateData = from._privateData;
from._privateData = NULL;
return *this;
}
@@ -101,7 +153,7 @@ BString::Adopt(BString &from)
BString&
BString::SetTo(const BString &string, int32 length)
{
_DoAssign(string.String(), length);
_DoAssign(string.String(), min(length, string.Length()));
return *this;
}
@@ -109,7 +161,15 @@ BString::SetTo(const BString &string, int32 length)
BString&
BString::Adopt(BString &from, int32 length)
{
//TODO: implement
if (_privateData)
free(_privateData - sizeof(int32));
_privateData = from._privateData;
from._privateData = NULL;
if (length < Length())
_privateData = _GrowBy(length - Length()); //Negative value
return *this;
}
@@ -117,7 +177,7 @@ BString::Adopt(BString &from, int32 length)
BString&
BString::SetTo(char c, int32 count)
{
char *tmp = (char*)calloc(count + 1, sizeof(char));
char *tmp = (char*)malloc(count);
memset(tmp, c, count);
_DoAssign(tmp, count);
free(tmp);
@@ -126,11 +186,21 @@ BString::SetTo(char c, int32 count)
}
/*---- Substring copying ---------------------------------------------------*/
BString &BString::CopyInto(BString &into, int32 fromOffset, int32 length) const
{
into.SetTo(String() + fromOffset, length);
return into;
}
void
BString::CopyInto(char *into, int32 fromOffset, int32 length) const
{
int32 len = (Length() - fromOffset < length ? Length() - fromOffset : length);
strncpy(into, _privateData + fromOffset, len);
if (into) {
int32 len = min(Length() - fromOffset , length);
strncpy(into, _privateData + fromOffset, len);
into[len] = 0;
}
}
@@ -138,7 +208,8 @@ BString::CopyInto(char *into, int32 fromOffset, int32 length) const
BString&
BString::operator+=(const char *str)
{
_DoAppend(str, strlen(str));
if (str)
_DoAppend(str, strlen(str));
return *this;
}
@@ -146,10 +217,7 @@ BString::operator+=(const char *str)
BString&
BString::operator+=(char c)
{
char *tmp = (char*)calloc(2, sizeof(char));
tmp[0] = c;
_DoAppend(tmp, 1);
free(tmp);
_DoAppend(&c, 1);
return *this;
}
@@ -157,7 +225,7 @@ BString::operator+=(char c)
BString&
BString::Append(const BString &string, int32 length)
{
_DoAppend(string.String(), length);
_DoAppend(string.String(), min(length, string.Length()));
return *this;
}
@@ -165,7 +233,8 @@ BString::Append(const BString &string, int32 length)
BString&
BString::Append(const char *str, int32 length)
{
_DoAppend(str, length);
if (str)
_DoAppend(str, min(length, (int32)strlen(str)));
return *this;
}
@@ -173,7 +242,7 @@ BString::Append(const char *str, int32 length)
BString&
BString::Append(char c, int32 count)
{
char *tmp = (char*)calloc(count + 1, sizeof(char));
char *tmp = (char*)malloc(count);
memset(tmp, c, count);
_DoAppend(tmp, count);
free(tmp);
@@ -185,7 +254,8 @@ BString::Append(char c, int32 count)
BString&
BString::Prepend(const char *str)
{
_DoPrepend(str, strlen(str));
if (str)
_DoPrepend(str, strlen(str));
return *this;
}
@@ -201,7 +271,8 @@ BString::Prepend(const BString &string)
BString&
BString::Prepend(const char *str, int32 len)
{
_DoPrepend(str, len);
if (str)
_DoPrepend(str, min(len, (int32)strlen(str)));
return *this;
}
@@ -209,7 +280,7 @@ BString::Prepend(const char *str, int32 len)
BString&
BString::Prepend(const BString &string, int32 len)
{
_DoPrepend(string.String(), len);
_DoPrepend(string.String(), min(len, string.Length()));
return *this;
}
@@ -217,7 +288,7 @@ BString::Prepend(const BString &string, int32 len)
BString&
BString::Prepend(char c, int32 count)
{
char *tmp = (char*)calloc(count + 1, sizeof(char));
char *tmp = (char*)malloc(count);
memset(tmp, c, count);
_DoPrepend(tmp, count);
free(tmp);
@@ -226,13 +297,248 @@ BString::Prepend(char c, int32 count)
/*---- Inserting ----------------------------------------------------------*/
BString&
BString::Insert(const char *str, int32 pos)
{
if (str) {
_privateData = _OpenAtBy(pos, strlen(str));
memcpy(_privateData + pos, str, strlen(str));
}
return *this;
}
BString&
BString::Insert(const char *str, int32 length, int32 pos)
{
if (str) {
int32 len = min(length, (int32)strlen(str));
_privateData = _OpenAtBy(pos, len);
memcpy(_privateData + pos, str, len);
}
return *this;
}
BString&
BString::Insert(const char *str, int32 fromOffset, int32 length, int32 pos)
{
if (str) {
int32 len = min(length, (int32)strlen(str));
_privateData = _OpenAtBy(pos, len);
memcpy(_privateData + pos, str + fromOffset, len);
}
return *this;
}
BString&
BString::Insert(const BString &string, int32 pos)
{
if (&string != this)
Insert(string.String(), pos);
return *this;
}
BString&
BString::Insert(const BString &string, int32 length, int32 pos)
{
if (&string != this)
Insert(string.String(), length, pos);
return *this;
}
BString&
BString::Insert(const BString &string, int32 fromOffset, int32 length, int32 pos)
{
if (&string != this)
Insert(string.String(), fromOffset, length, pos);
return *this;
}
BString&
BString::Insert(char c, int32 count, int32 pos)
{
char *tmp = (char*)malloc(count);
memset(tmp, c, count);
_privateData = _OpenAtBy(pos, count);
memcpy(_privateData + pos, tmp, count);
free(tmp);
return *this;
}
/*---- Removing -----------------------------------------------------------*/
BString&
BString::Truncate(int32 newLength, bool lazy = true)
{
if (newLength < Length()) {
#if 0
if (lazy)
; //ToDo: Fix this
else
#endif
_privateData = _GrowBy(newLength - Length()); // Negative value
_privateData[Length()] = 0;
}
return *this;
}
BString&
BString::Remove(int32 from, int32 length)
{
_privateData = _ShrinkAtBy(from, length);
return *this;
}
/*---- Compare functions ---------------------------------------------------*/
// Implemented inline in the header file
/*---- strcmp-style compare functions --------------------------------------*/
int
BString::Compare(const BString &string) const
{
return strcmp(_privateData, string.String());
}
int
BString::Compare(const char *string) const
{
return strcmp(_privateData, string);
}
int
BString::Compare(const BString &string, int32 n) const
{
return strncmp(_privateData, string.String(), n);
}
int
BString::Compare(const char *string, int32 n) const
{
return strncmp(_privateData, string, n);
}
int
BString::ICompare(const BString &string) const
{
return strcasecmp(_privateData, string.String());
}
int
BString::ICompare(const char *str) const
{
return strcasecmp(_privateData, str);
}
int
BString::ICompare(const BString &string, int32 n) const
{
return strncasecmp(_privateData, string.String(), n);
}
int
BString::ICompare(const char *str, int32 n) const
{
return strncasecmp(_privateData, str, n);
}
/*---- Searching -----------------------------------------------------------*/
int32
BString::FindFirst(const BString &string) const
{
return _FindAfter(string.String(), 0, -1);
}
int32
BString::FindFirst(const char *string) const
{
return _FindAfter(string, 0, -1);
}
int32
BString::FindFirst(const BString &string, int32 fromOffset) const
{
return _FindAfter(string.String(), fromOffset, -1);
}
int32
BString::FindFirst(const char *string, int32 fromOffset) const
{
return _FindAfter(string, fromOffset, -1);
}
int32
BString::FindFirst(char c) const
{
return _FindAfter(&c, 0, -1);
}
int32
BString::FindFirst(char c, int32 fromOffset) const
{
return _FindAfter(&c, fromOffset, -1);
}
/*---- Replacing -----------------------------------------------------------*/
/*---- Fast low-level manipulation -----------------------------------------*/
char*
BString::LockBuffer(int32 maxLength)
{
if (maxLength > Length())
_privateData = _GrowBy(maxLength - Length());
return _privateData;
}
BString&
BString::UnlockBuffer(int32 length)
{
int32 len = length;
if (len < 0)
len = strlen(_privateData);
else if (len > Length())
len = Length();
if (len > 0)
_privateData = _ShrinkAtBy(len, Length() - len);
return *this;
}
/*---- Uppercase<->Lowercase ------------------------------------------------*/
/*----- Escaping and Deescaping --------------------------------------------*/
/*---- Simple sprintf replacement calls ------------------------------------*/
/*---- Slower than sprintf but type and overflow safe ----------------------*/
BString&
BString::operator<<(const char *str)
{
_DoAppend(str, strlen(str));
if (str)
_DoAppend(str, strlen(str));
return *this;
}
@@ -248,11 +554,7 @@ BString::operator<<(const BString &string)
BString&
BString::operator<<(char c)
{
char *tmp = (char*)calloc(2, sizeof(char));
tmp[0] = c;
_DoAppend(tmp, 1);
free(tmp);
_DoAppend(&c, 1);
return *this;
}
@@ -314,45 +616,93 @@ BString::operator<<(float f)
/*---- Private or Reserved ------------------------------------------------*/
void
BString::_Init(const char* string, int32 len)
BString::_Init(const char* str, int32 len)
{
_privateData = (char*)calloc(len + sizeof(int32) + 1, sizeof(char));
_SetLength(len);
_privateData += sizeof(int32);
strncpy(_privateData, string, len);
assert(str != NULL);
_privateData = _GrowBy(len);
strncpy(_privateData, str, len);
}
void
BString::_DoAssign(const char *string, int32 len)
{
if (_privateData) {
_privateData -= sizeof(int32);
free(_privateData);
}
_privateData = (char*)calloc(len + sizeof(int32) + 1, sizeof(char));
_SetLength(len);
_privateData += sizeof(int32);
strncpy(_privateData, string, len);
BString::_DoAssign(const char *str, int32 len)
{
assert(str != NULL);
int32 curLen = Length();
if (len > curLen)
_privateData = _GrowBy(len - curLen);
else if (len < curLen)
_privateData = _ShrinkAtBy(0, curLen - len);
strncpy(_privateData, str, len);
}
void
BString::_DoAppend(const char *str, int32 len)
{
_privateData -= sizeof(int32);
assert(str != NULL);
_privateData = _GrowBy(len);
_SetLength(len);
_privateData += sizeof(int32);
strncat(_privateData, str, len);
}
char*
BString::_GrowBy(int32 size)
{
{
int32 curLen = Length();
_privateData = (char*)realloc(_privateData, curLen + size);
if (_privateData) {
_privateData -= sizeof(int32);
_privateData = (char*)realloc(_privateData,
curLen + size + sizeof(int32) + 1);
} else
_privateData = (char*)malloc(size + sizeof(int32) + 1);
_privateData += sizeof(int32);
_SetLength(curLen + size);
_privateData[Length()] = 0;
return _privateData;
}
char*
BString::_OpenAtBy(int32 offset, int32 length)
{
int32 oldLength = Length();
_privateData -= sizeof(int32);
_privateData = (char*)realloc(_privateData , oldLength + length + sizeof(int32) + 1);
_privateData += sizeof(int32);
memmove(_privateData + offset + length, _privateData + offset,
oldLength - offset);
_SetLength(oldLength + length);
_privateData[Length()] = 0;
return _privateData;
}
char*
BString::_ShrinkAtBy(int32 offset, int32 length)
{
assert(offset + length < Length());
int32 oldLength = Length();
memmove(_privateData + offset, _privateData + offset + length,
Length() - offset - length);
_privateData -= sizeof(int32);
_privateData = (char*)realloc(_privateData, oldLength - length + sizeof(int32) + 1);
_privateData += sizeof(int32);
_SetLength(oldLength - length);
_privateData[Length()] = 0;
return _privateData;
}
@@ -360,24 +710,58 @@ BString::_GrowBy(int32 size)
void
BString::_DoPrepend(const char *str, int32 count)
{
char *tmp = strdup(_privateData);
char *src = strdup(str);
_privateData -= sizeof(int32);
free(_privateData);
_privateData = (char*)calloc(strlen(str) + 1 + sizeof(int32), sizeof(char));
_SetLength(strlen(tmp) + count);
_privateData += sizeof(int32);
strncpy(_privateData, src, count);
strcat(_privateData, tmp);
free(tmp);
free(src);
assert(str != NULL);
_privateData = _GrowBy(count);
strncpy(_privateData, str, count);
}
int32
BString::_FindAfter(const char *str, int32 offset, int32) const
{
if (offset > Length())
return B_ERROR;
char *ptr = strstr(String() + offset, str);
if (ptr != NULL)
return ptr - (String() + offset);
else
return B_ERROR;
}
void
BString::_SetLength(int32 length)
{
*(int32*)_privateData = length;
*((int32*)_privateData - 1) = length & 0x7fffffff;
}
/*----- Non-member compare for sorting, etc. ------------------------------*/
int
Compare(const BString &string1, const BString &string2)
{
return strcmp(string1.String(), string2.String());
}
int
ICompare(const BString &string1, const BString &string2)
{
return strcasecmp(string1.String(), string2.String());
}
int
Compare(const BString *string1, const BString *string2)
{
return strcmp(string1->String(), string2->String());
}
int
ICompare(const BString *string1, const BString *string2)
{
return strcasecmp(string1->String(), string2->String());
}