gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Integrate new parser

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18537 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2004-02-04 06:15:53 +00:00
parent 3c7cd0b0ba
commit 188274523d
2 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-02-02 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPropertyList.m: Integrate new parser to
NSPropertyListSerialisation
2004-02-04 01:10 Alexander Malmberg <alexander@malmberg.org>
* Headers/Foundation/NSObject.h (ASSIGNCOPY),

36
Source/NSPropertyList.m
View file

@ -2064,7 +2064,11 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
{
bytes = [data bytes];
length = [data length];
if (bytes[0] == 0 || bytes[0] == 1)
if (length > 0 && memcmp(bytes, "bplist00", 8) == 0)
{
format = NSPropertyListBinaryFormat_v1_0;
}
else if (bytes[0] == 0 || bytes[0] == 1)
{
format = NSPropertyListGNUstepBinaryFormat;
}
@ -2167,6 +2171,16 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
}
break;
case NSPropertyListBinaryFormat_v1_0:
{
GSBinaryPLParser *p = [GSBinaryPLParser alloc];
p = [p initWithData: data mutability: anOption];
result = [p rootObject];
RELEASE(p);
}
break;
default:
error = @"format not supported";
break;
@ -2522,7 +2536,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
char *buffer;
len = [self readCountAt: &counter];
buffer = malloc(len+1);
buffer = NSZoneMalloc(NSDefaultMallocZone(), len+1);
[data getBytes: buffer range: NSMakeRange(counter, len)];
buffer[len] = '\0';
if (mutability == NSPropertyListMutableContainersAndLeaves)
@ -2533,7 +2547,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
{
result = [NSString stringWithUTF8String: buffer];
}
free(buffer);
NSZoneFree(NSDefaultMallocZone(), buffer);
}
else if ((next >= 0x60) && (next < 0x6F))
{
@ -2567,7 +2581,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
unichar *buffer;
len = [self readCountAt: &counter];
buffer = malloc(sizeof(unichar)*len);
buffer = NSZoneMalloc(NSDefaultMallocZone(), sizeof(unichar)*len);
[data getBytes: buffer range: NSMakeRange(counter, sizeof(unichar)*len)];
for (i = 0; i < len; i++)
@ -2583,7 +2597,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
{
result = [NSString stringWithCharacters: buffer length: len];
}
free(buffer);
NSZoneFree(NSDefaultMallocZone(), buffer);
}
else if (next == 0x80)
{
@ -2632,7 +2646,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
id *objects;
len = [self readCountAt: &counter];
objects = malloc(sizeof(id) * len);
objects = NSZoneMalloc(NSDefaultMallocZone(), sizeof(id) * len);
for (i = 0; i < len; i++)
{
@ -2650,7 +2664,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
{
result =[NSArray arrayWithObjects: objects count: len];
}
free(objects);
NSZoneFree(NSDefaultMallocZone(), objects);
}
else if ((next >= 0xD0) && (next < 0xDF))
{
@ -2697,8 +2711,8 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
id *values;
len = [self readCountAt: &counter];
keys = malloc(sizeof(id)*len);
values = malloc(sizeof(id)*len);
keys = NSZoneMalloc(NSDefaultMallocZone(), sizeof(id)*len);
values = NSZoneMalloc(NSDefaultMallocZone(), sizeof(id)*len);
for (i = 0; i < len; i++)
{
int oid = [self readObjectIndexAt: &counter];
@ -2726,8 +2740,8 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
forKeys: keys
count: len];
}
free(values);
free(keys);
NSZoneFree(NSDefaultMallocZone(), values);
NSZoneFree(NSDefaultMallocZone(), keys);
}
else
{