root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accetta anche NULL nella add delle token strings.

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@29 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-08-17 14:08:59 +00:00
parent 2fc3fcb138
commit bd4da82c82
1 changed files with 886 additions and 889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/strings.cpp
View File

@ -487,7 +487,7 @@ word TString::hash() const
// Certified 100%
TFixed_string::TFixed_string(const char* str, int size)
: TString((char*)str, (size < 1) ? strlen(str) : size-1)
: TString((char*)str, (size < 1) ? strlen(str) : size-1)
{
if (size > 0 && memchr(str, 0, size) == NULL)
cut(0);
@ -617,7 +617,7 @@ TString& TFilename::temp(const char* prefix)
// Certified 100%
TToken_string::TToken_string(const char* s, char separator)
: TString(s), _separator(separator)
: TString(s), _separator(separator)
{
restart();
@ -625,13 +625,13 @@ TToken_string::TToken_string(const char* s, char separator)
// Certified 100%
TToken_string::TToken_string(int n, char separator)
: TString(n), _separator(separator), _last(-2)
: TString(n), _separator(separator), _last(-2)
{}
// Certified 100%
TToken_string::TToken_string(const TToken_string& s)
: TString(s), _separator(s._separator), _last(s._last)
: TString(s), _separator(s._separator), _last(s._last)
{}
@ -788,9 +788,7 @@ int TToken_string::items() const
// Certified 99%
void TToken_string::add(const char* s, int pos)
{
if (s)
{
if (!*s) s = " ";
if (s == NULL || *s == '\0') s = " ";
if (pos < 0)
{
if (not_empty()) *this << _separator;
@ -799,13 +797,12 @@ void TToken_string::add(const char* s, int pos)
else
set_item(s, pos);
if (_last < 0) _last = 0;
}
}
// Certified 0%
void TToken_string::add(char c, int pos)
{
char s[2] = { c, 0 };
const char s[2] = { c, '\0' };
add(s, pos);
}
@ -822,7 +819,7 @@ void TToken_string::add(int n, int pos)
{
char s[16];
sprintf(s, "%d", n);
add(s,pos);
add(s, pos);
}
// Certified 50%
@ -857,7 +854,7 @@ void TToken_string::destroy(int n)
///////////////////////////////////////////////////////////
TParagraph_string::TParagraph_string(const char* s, int width)
: TToken_string(s, '|'), _width(width)
: TToken_string(s, '|'), _width(width)
{ tokenize(); }
const TString& TParagraph_string::operator =(const char* s)