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

Tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15654 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-01-20 17:18:06 +00:00
parent 2c70c72df9
commit 6cff936ed7
8 changed files with 138 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Source/NSArray.m
View file

@ -306,12 +306,16 @@ static SEL rlSel;
}
/**
* The default NSArray implemntation of a copy is simply to -retain
* the receiver and return it.
* Returns a new copy of the receiver.<br />
* The default abstract implementation of a copy is to use the
* -initWithArray:copyItems: method with the flag set to YES.<br />
* Immutable subclasses generally simply retain and return the receiver.
*/
- (id) copyWithZone: (NSZone*)zone
{
return RETAIN(self);
NSArray *copy = [NSArrayClass allocWithZone: zone];
return [copy initWithArray: self copyItems: YES];
}
/** <override-subclass />
@ -669,12 +673,16 @@ static SEL rlSel;
/**
* Returns an NSMutableArray instance containing the same objects as
* the receiver.
* the receiver.<br />
* The default implementation does this by calling the
* -initWithArray:copyItems: method on a newly created object,
* and passing it NO to tell it just to retain the items.
*/
- (id) mutableCopyWithZone: (NSZone*)zone
{
return [[GSMutableArrayClass allocWithZone: zone]
initWithArray: self];
NSMutableArray *copy = [NSMutableArrayClass allocWithZone: zone];
return [copy initWithArray: self copyItems: NO];
}
/** <override-subclass />
@ -828,7 +836,7 @@ static int compare(id elem1, id elem2, void* context)
NSMutableArray *sortedArray;
sortedArray = [[NSMutableArrayClass allocWithZone:
NSDefaultMallocZone()] initWithArray: self];
NSDefaultMallocZone()] initWithArray: self copyItems: NO];
[sortedArray sortUsingFunction: comparator context: context];
return AUTORELEASE([sortedArray makeImmutableCopyOnFail: NO]);
@ -1108,32 +1116,6 @@ static int compare(id elem1, id elem2, void* context)
return NSMutableArrayClass;
}
/* The NSCopying Protocol */
- (id) copyWithZone: (NSZone*)zone
{
/* a deep copy */
unsigned count = [self count];
id objects[count];
NSArray *newArray;
unsigned i;
[self getObjects: objects];
for (i = 0; i < count; i++)
{
objects[i] = [objects[i] copyWithZone: zone];
}
newArray = [[GSArrayClass allocWithZone: zone]
initWithObjects: objects count: count];
#if GS_WITH_GC == 0
while (i > 0)
{
[objects[--i] release];
}
#endif
return newArray;
}
/** <init />
* Initialise the array with the specified capacity ... this
* should ensure that the array can have numItems added efficiently.