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

fix bug #20215

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25272 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-06-20 04:36:31 +00:00
parent 092bd56254
commit 7fc6b260a2
2 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-06-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPredicate.m: Fix bug #20215 ... scanning of greater than
and less than operators.
2007-06-15 Adam Fedor <fedor@gnu.org>
* Source/NSTimeZone.m ([NSTimeZone +timeZoneArray]): Skip .tab

26
Source/NSPredicate.m
View file

@ -1605,8 +1605,8 @@
{
NSPredicate *l = [self parseNot];
while ([self scanPredicateKeyword: @"OR"] ||
[self scanPredicateKeyword: @"||"])
while ([self scanPredicateKeyword: @"OR"]
|| [self scanPredicateKeyword: @"||"])
{
NSPredicate *r = [self parseNot];
@ -1677,34 +1677,34 @@
}
left = [self parseExpression];
if ([self scanString: @"<" intoString: NULL])
if ([self scanString: @"!=" intoString: NULL]
|| [self scanString: @"<>" intoString: NULL])
{
type = NSLessThanPredicateOperatorType;
type = NSNotEqualToPredicateOperatorType;
}
else if ([self scanString: @"<=" intoString: NULL]
|| [self scanString: @"=<" intoString: NULL])
{
type = NSLessThanOrEqualToPredicateOperatorType;
}
else if ([self scanString: @">" intoString: NULL])
{
type = NSGreaterThanPredicateOperatorType;
}
else if ([self scanString: @">=" intoString: NULL]
|| [self scanString: @"=>" intoString: NULL])
{
type = NSGreaterThanOrEqualToPredicateOperatorType;
}
else if ([self scanString: @"<" intoString: NULL])
{
type = NSLessThanPredicateOperatorType;
}
else if ([self scanString: @">" intoString: NULL])
{
type = NSGreaterThanPredicateOperatorType;
}
else if ([self scanString: @"==" intoString: NULL]
|| [self scanString: @"=" intoString: NULL])
{
type = NSEqualToPredicateOperatorType;
}
else if ([self scanString: @"!=" intoString: NULL]
|| [self scanString: @"<>" intoString: NULL])
{
type = NSNotEqualToPredicateOperatorType;
}
else if ([self scanPredicateKeyword: @"MATCHES"])
{
type = NSMatchesPredicateOperatorType;