gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 12:16:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change behavior of -boolValue to match the new MacOS-X method of the same name.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26110 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-02-20 09:56:25 +00:00
parent 726b05507e
commit b4c5948f8d
3 changed files with 34 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

78
Source/GSString.m
View file

@ -938,75 +938,33 @@ UTF8String_u(GSStr self)
static inline BOOL
boolValue_c(GSStr self)
{
if (self->_count == 0)
{
return NO;
}
else
{
unsigned len = self->_count < 10 ? self->_count : 9;
unsigned c = self->_count;
unsigned i;
if (len == 3
&& (self->_contents.c[0] == 'Y' || self->_contents.c[0] == 'y')
&& (self->_contents.c[1] == 'E' || self->_contents.c[1] == 'e')
&& (self->_contents.c[2] == 'S' || self->_contents.c[2] == 's'))
{
return YES;
}
else if (len == 4
&& (self->_contents.c[0] == 'T' || self->_contents.c[0] == 't')
&& (self->_contents.c[1] == 'R' || self->_contents.c[1] == 'r')
&& (self->_contents.c[2] == 'U' || self->_contents.c[2] == 'u')
&& (self->_contents.c[3] == 'E' || self->_contents.c[3] == 'e'))
{
return YES;
}
else
{
unsigned char buf[len+1];
memcpy(buf, self->_contents.c, len);
buf[len] = '\0';
return atoi((const char*)buf);
}
for (i = 0; i < c; i++)
{
if (strchr("123456789yYtT", self->_contents.c[i]) != 0)
{
return YES;
}
}
return NO;
}
static inline BOOL
boolValue_u(GSStr self)
{
if (self->_count == 0)
{
return NO;
}
else
{
unsigned int l = self->_count < 10 ? self->_count : 9;
unsigned char buf[l+1];
unsigned char *b = buf;
unsigned c = self->_count;
unsigned i;
GSFromUnicode(&b, &l, self->_contents.u, l, internalEncoding,
0, GSUniTerminate);
if (l == 3
&& (buf[0] == 'Y' || buf[0] == 'y')
&& (buf[1] == 'E' || buf[1] == 'e')
&& (buf[2] == 'S' || buf[2] == 's'))
{
return YES;
}
else if (l == 4
&& (buf[0] == 'T' || buf[0] == 't')
&& (buf[1] == 'R' || buf[1] == 'r')
&& (buf[2] == 'U' || buf[2] == 'u')
&& (buf[3] == 'E' || buf[3] == 'e'))
{
return YES;
}
else
{
return atoi((const char*)buf);
}
for (i = 0; i < c; i++)
{
if (strchr("123456789yYtT", self->_contents.u[i]) != 0)
{
return YES;
}
}
return NO;
}
static inline BOOL