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

Fix missing @count support

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26311 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-03-16 07:22:08 +00:00
parent a078786dfd
commit 6e89e23210
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Source/NSArray.m
View file

@ -1326,7 +1326,14 @@ compare(id elem1, id elem2, void* context)
r = [path rangeOfString: @"."];
if (r.length == 0)
{
result = [self valueForKey: path];
if ([path isEqualToString: @"@count"] == YES)
{
result = [NSNumber numberWithUnsignedInt: [self count]];
}
else
{
result = [self valueForKey: path];
}
}
else
{
@ -1334,7 +1341,11 @@ compare(id elem1, id elem2, void* context)
NSString *rem = [path substringFromIndex: NSMaxRange(r)];
unsigned count = [self count];
if ([op isEqualToString: @"@avg"] == YES)
if ([op isEqualToString: @"@count"] == YES)
{
result = [NSNumber numberWithUnsignedInt: count];
}
else if ([op isEqualToString: @"@avg"] == YES)
{
double d = 0;

15
Source/NSSet.m
View file

@ -627,7 +627,14 @@ static Class NSMutableSet_concrete_class;
r = [path rangeOfString: @"."];
if (r.length == 0)
{
result = [self valueForKey: path];
if ([path isEqualToString: @"@count"] == YES)
{
result = [NSNumber numberWithUnsignedInt: [self count]];
}
else
{
result = [self valueForKey: path];
}
}
else
{
@ -635,7 +642,11 @@ static Class NSMutableSet_concrete_class;
NSString *rem = [path substringFromIndex: NSMaxRange(r)];
unsigned count = [self count];
if ([op isEqualToString: @"@avg"] == YES)
if ([op isEqualToString: @"@count"] == YES)
{
result = [NSNumber numberWithUnsignedInt: count];
}
else if ([op isEqualToString: @"@avg"] == YES)
{
double d = 0;