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

More keyed coding updates.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18495 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2004-01-28 07:33:20 +00:00
parent 811be03fe2
commit 5893a40526
11 changed files with 326 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Source/NSArray.m
View file

@ -357,18 +357,45 @@ static SEL rlSel;
{
unsigned count = [self count];
[aCoder encodeValueOfObjCType: @encode(unsigned)
at: &count];
if (count > 0)
if ([aCoder allowsKeyedCoding])
{
GS_BEGINIDBUF(a, count)
/* HACK ... MacOS-X seems to code differently if the coder is an
* actual instance of NSKeyedArchiver
*/
if ([aCoder class] == [NSKeyedArchiver class])
{
[(NSKeyedArchiver*)aCoder _encodeArrayOfObjects: self
forKey: @"NS.objects"];
}
else
{
unsigned i;
[self getObjects: a];
[aCoder encodeArrayOfObjCType: @encode(id)
count: count
at: a];
GS_ENDIDBUF()
for (i = 0; i < count; i++)
{
NSString *key;
key = [NSString stringWithFormat: @"NS.object.%u", i];
[(NSKeyedArchiver*)aCoder encodeObject: [self objectAtIndex: i]
forKey: key];
}
}
}
else
{
[aCoder encodeValueOfObjCType: @encode(unsigned)
at: &count];
if (count > 0)
{
GS_BEGINIDBUF(a, count)
[self getObjects: a];
[aCoder encodeArrayOfObjCType: @encode(id)
count: count
at: a];
GS_ENDIDBUF()
}
}
}
@ -556,10 +583,30 @@ static SEL rlSel;
{
if ([aCoder allowsKeyedCoding])
{
NSArray *array = [(NSKeyedUnarchiver*)aCoder _decodeArrayOfObjectsForKey:
@"NS.objects"];
id array;
[self initWithArray: array];
array = [(NSKeyedUnarchiver*)aCoder _decodeArrayOfObjectsForKey:
@"NS.objects"];
if (array == nil)
{
unsigned i = 0;
NSString *key;
id val;
array = [NSMutableArray arrayWithCapacity: 2];
key = [NSString stringWithFormat: @"NS.object.%u", i];
val = [(NSKeyedUnarchiver*)aCoder decodeObjectForKey: key];
while (val != nil)
{
[array addObject: val];
i++;
key = [NSString stringWithFormat: @"NS.object.%u", i];
val = [(NSKeyedUnarchiver*)aCoder decodeObjectForKey: key];
}
}
self = [self initWithArray: array];
}
else
{