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

Property-list optimisations.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4300 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-05-26 17:09:21 +00:00
parent 37116b1f02
commit f4af85f50e
4 changed files with 133 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Source/NSGCString.m
View file

@ -74,6 +74,10 @@ static SEL msInitSel = @selector(initWithCapacity:);
static IMP csInitImp; /* designated initialiser for cString */
static IMP msInitImp; /* designated initialiser for mutable */
@interface NSGMutableCString (GNUDescription)
- (char*) _extendBy: (unsigned)len;
@end
@implementation NSGCString
+ (void) initialize
@ -539,6 +543,9 @@ static IMP msInitImp; /* designated initialiser for mutable */
- (void) descriptionTo: (id<GNUDescriptionDestination>)output
{
if (output == nil)
return;
if (_count == 0)
{
[output appendString: @"\"\""];
@ -586,11 +593,21 @@ static IMP msInitImp; /* designated initialiser for mutable */
if (needQuote || length != _count)
{
NSZone *z = fastZone(self);
char *buf = NSZoneMalloc(z, length+3);
char *ptr = buf;
NSString *result;
Class c = fastClass(output);
NSZone *z = NSDefaultMallocZone();
char *buf;
char *ptr;
length += 2;
if (c == _fastCls._NSGMutableCString)
{
buf = [(NSGMutableCString*)output _extendBy: length];
}
else
{
buf = NSZoneMalloc(z, length+1);
}
ptr = buf;
*ptr++ = '"';
for (i = 0; i < _count; i++)
{
@ -626,10 +643,15 @@ static IMP msInitImp; /* designated initialiser for mutable */
}
*ptr++ = '"';
*ptr = '\0';
result = [[_fastCls._NSGCString allocWithZone: NSDefaultMallocZone()]
initWithCStringNoCopy: buf length: length+2 fromZone: z];
[output appendString: result];
[result release];
if (c != _fastCls._NSGMutableCString)
{
NSString *result;
result = [[_fastCls._NSGCString allocWithZone: z]
initWithCStringNoCopy: buf length: length fromZone: z];
[output appendString: result];
[result release];
}
}
else
{
@ -757,6 +779,14 @@ typedef struct {
@defs(NSGMutableCString)
} NSGMutableCStringStruct;
static inline void
stringGrowBy(NSGMutableCStringStruct *self, unsigned size)
{
self->_capacity = MAX(self->_capacity*2, self->_count+size+1);
self->_contents_chars
= NSZoneRealloc(self->_zone, self->_contents_chars, self->_capacity);
}
static inline void
stringIncrementCountAndMakeHoleAt(NSGMutableCStringStruct *self,
int index, int size)
@ -939,10 +969,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableCStringStruct *self,
unsigned c = [aString cStringLength];
char save;
if (_count + c >= _capacity)
{
_capacity = MAX(_capacity*2, _count+c+1);
_contents_chars = NSZoneRealloc(_zone, _contents_chars, _capacity);
}
stringGrowBy((NSGMutableCStringStruct *)self, c);
stringIncrementCountAndMakeHoleAt((NSGMutableCStringStruct*)self, index, c);
save = _contents_chars[index+c]; // getCString will put a nul here.
[aString getCString: _contents_chars + index];
@ -961,11 +988,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableCStringStruct *self,
unsigned l = other->_count;
if (_count + l > _capacity)
{
_capacity = MAX(_capacity*2, _count+l);
_contents_chars =
NSZoneRealloc(fastZone(self), _contents_chars, _capacity);
}
stringGrowBy((NSGMutableCStringStruct *)self, l);
memcpy(_contents_chars + _count, other->_contents_chars, l);
_count += l;
_hash = 0;
@ -974,11 +997,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableCStringStruct *self,
{
unsigned l = [aString cStringLength];
if (_count + l >= _capacity)
{
_capacity = MAX(_capacity*2, _count+l+1);
_contents_chars =
NSZoneRealloc(fastZone(self), _contents_chars, _capacity);
}
stringGrowBy((NSGMutableCStringStruct *)self, l);
[aString getCString: _contents_chars + _count];
_count += l;
_hash = 0;
@ -1061,6 +1080,16 @@ stringDecrementCountAndFillHoleAt(NSGMutableCStringStruct *self,
stringDecrementCountAndFillHoleAt((NSGMutableCStringStruct*)self, index, 1);
}
- (char*) _extendBy: (unsigned)len
{
char *ptr;
stringGrowBy((NSGMutableCStringStruct *)self, len);
ptr = _contents_chars + _count;
_count += len;
_hash = 0;
return ptr;
}
@end
@implementation NXConstantString