gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix for #19446

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24945 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-03-30 03:39:18 +00:00
parent b895bfcf18
commit 1c711c67ea
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-03-30 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPredicate.m: ([-parseOr]) Use orPredicateWithSubpredicates
rather than andPredicateWithSubpredicates. Fix for bug #19446.
2007-03-25 Richard Frith-Macdonald <rfm@gnu.org> 2007-03-25 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSTimer.m: minor optimisation ... avoid unnecessary use of * Source/NSTimer.m: minor optimisation ... avoid unnecessary use of

10
Source/NSPredicate.m
View file

@ -1435,11 +1435,11 @@
notPredicateWithSubpredicate: [self parseNot]]; notPredicateWithSubpredicate: [self parseNot]];
} }
if ([self scanPredicateKeyword:@"TRUEPREDICATE"]) if ([self scanPredicateKeyword: @"TRUEPREDICATE"])
{ {
return [NSPredicate predicateWithValue: YES]; return [NSPredicate predicateWithValue: YES];
} }
if ([self scanPredicateKeyword:@"FALSEPREDICATE"]) if ([self scanPredicateKeyword: @"FALSEPREDICATE"])
{ {
return [NSPredicate predicateWithValue: NO]; return [NSPredicate predicateWithValue: NO];
} }
@ -1451,7 +1451,7 @@
{ {
NSPredicate *l = [self parseNot]; NSPredicate *l = [self parseNot];
while ([self scanPredicateKeyword:@"OR"]) while ([self scanPredicateKeyword: @"OR"])
{ {
NSPredicate *r = [self parseNot]; NSPredicate *r = [self parseNot];
@ -1483,7 +1483,7 @@
} }
else else
{ {
l = [NSCompoundPredicate andPredicateWithSubpredicates: l = [NSCompoundPredicate orPredicateWithSubpredicates:
[NSArray arrayWithObjects: l, r, nil]]; [NSArray arrayWithObjects: l, r, nil]];
} }
} }
@ -1771,7 +1771,7 @@
[args addObject: [self parseExpression]]; [args addObject: [self parseExpression]];
} }
if (![self scanString:@")" intoString:NULL]) if (![self scanString: @")" intoString: NULL])
{ {
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
format: @"Missing ) in function arguments"]; format: @"Missing ) in function arguments"];