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

Minor substring optimisation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22975 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-05-23 19:29:52 +00:00
parent 56e23e060e
commit 0dfcfd4814
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -4,6 +4,8 @@
it needed more data even though it had actually completed. it needed more data even though it had actually completed.
* Source/NSException.m: Don't add stacktrace information if we are * Source/NSException.m: Don't add stacktrace information if we are
not building with debug on. not building with debug on.
* Source/GSString.m: Minor optimisation ... return @"" for all
substrings with a zero length range.
2006-05-22 Richard Frith-Macdonald <rfm@gnu.org> 2006-05-22 Richard Frith-Macdonald <rfm@gnu.org>

16
Source/GSString.m
View file

@ -2455,6 +2455,10 @@ substring_c(GSStr self, NSRange aRange)
@defs(GSCSubString) @defs(GSCSubString)
} *o; } *o;
if (aRange.length == 0)
{
return @"";
}
o = (typeof(o))NSAllocateObject(GSCSubStringClass, o = (typeof(o))NSAllocateObject(GSCSubStringClass,
0, NSDefaultMallocZone()); 0, NSDefaultMallocZone());
o->_contents.c = self->_contents.c + aRange.location; o->_contents.c = self->_contents.c + aRange.location;
@ -2473,6 +2477,10 @@ substring_u(GSStr self, NSRange aRange)
@defs(GSUnicodeSubString) @defs(GSUnicodeSubString)
} *o; } *o;
if (aRange.length == 0)
{
return @"";
}
o = (typeof(o))NSAllocateObject(GSUnicodeSubStringClass, o = (typeof(o))NSAllocateObject(GSUnicodeSubStringClass,
0, NSDefaultMallocZone()); 0, NSDefaultMallocZone());
o->_contents.u = self->_contents.u + aRange.location; o->_contents.u = self->_contents.u + aRange.location;
@ -4127,6 +4135,10 @@ agree, create a new GSUnicodeInlineString otherwise.
{ {
GS_RANGE_CHECK(aRange, _count); GS_RANGE_CHECK(aRange, _count);
if (aRange.length == 0)
{
return @"";
}
if (_flags.wide == 1) if (_flags.wide == 1)
{ {
struct { struct {
@ -4164,6 +4176,10 @@ agree, create a new GSUnicodeInlineString otherwise.
{ {
GS_RANGE_CHECK(aRange, _count); GS_RANGE_CHECK(aRange, _count);
if (aRange.length == 0)
{
return @"";
}
if (_flags.wide == 1) if (_flags.wide == 1)
{ {
struct { struct {