immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix operator+ semantics in CBotString

dev-time-step
Piotr Dziwinski 2015-11-02 22:08:52 +00:00
parent 82ece357d6
commit eeea31408b
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CBot/CBotDll.h
View File

@ -397,8 +397,8 @@ public:
const CBotString& operator=(const CBotString& stringSrc); const CBotString& operator=(const CBotString& stringSrc);
const CBotString& operator=(const char ch); const CBotString& operator=(const char ch);
const CBotString& operator=(const char* pString); const CBotString& operator=(const char* pString);
const CBotString& operator+(const CBotString& str);
friend CBotString operator+(const CBotString& string, const char* lpsz); friend CBotString operator+(const CBotString& string, const char* lpsz);
CBotString operator+(const CBotString& str);
const CBotString& operator+=(const char ch); const CBotString& operator+=(const char ch);
const CBotString& operator+=(const CBotString& str); const CBotString& operator+=(const CBotString& str);

16
src/CBot/CBotString.cpp
View File

@ -344,19 +344,11 @@ CBotString operator+(const CBotString& string, const char * lpsz)
return s; return s;
} }
const CBotString& CBotString::operator+(const CBotString& stringSrc) CBotString CBotString::operator+(const CBotString& stringSrc)
{ {
char* p = new char[m_lg+stringSrc.m_lg+1]; CBotString s(*this);
s += stringSrc;
if (m_ptr!=nullptr) strcpy(p, m_ptr); return s;
char* pp = p + m_lg;
if (stringSrc.m_ptr!=nullptr) strcpy(pp, stringSrc.m_ptr);
delete[] m_ptr;
m_ptr = p;
m_lg += stringSrc.m_lg;
return *this;
} }
const CBotString& CBotString::operator=(const char ch) const CBotString& CBotString::operator=(const char ch)

9
test/unit/CBot/CBotString_test.cpp
View File

@ -271,10 +271,13 @@ TEST(CBotString_Test, operatorAdd)
CBotString botStr4("Colobot"); CBotString botStr4("Colobot");
//-- C string //-- C string
const char cStr1[7] = "olobot"; const char* cStr1 = "olobot";
botStr1 + botStr2; botStr1 = botStr1 + botStr2;
botStr1 + botStr3; botStr1 = botStr1 + botStr3;
EXPECT_STREQ(botStr1.CStr(), botStr4.CStr());
botStr1 = "C" + botStr3;
EXPECT_STREQ(botStr1.CStr(), botStr4.CStr()); EXPECT_STREQ(botStr1.CStr(), botStr4.CStr());
botStr1.Empty(); botStr1.Empty();