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

Improved predicate parsing.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25234 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2007-06-09 16:37:26 +00:00
parent dd723fd60e
commit fb6739feb4
2 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2007-06-09 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSPredicate.m: Improved predicate parsing.
2007-06-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSString.m Fix bug getting cString from literal string

50
Source/NSPredicate.m
View file

@ -735,6 +735,7 @@
return ([leftResult compare: rightResult options: compareOptions range: range] == NSOrderedSame);
}
case NSInPredicateOperatorType:
// FIXME: Handle special case where rightResult is a collection and leftResult an element of it.
return ([leftResult rangeOfString: rightResult options: compareOptions].location != NSNotFound);
case NSCustomSelectorPredicateOperatorType:
{
@ -843,7 +844,7 @@
if (![e respondsToSelector: e->_selector])
{
[NSException raise: NSInvalidArgumentException
format: @"Unknown function implementation: %@", name];
format: @"Unknown function implementation: %@", name];
}
ASSIGN(e->_function, name);
e->_argc = [args count];
@ -1451,6 +1452,14 @@
// no match
return NO;
}
if ([self isAtEnd])
{
// ok
return YES;
}
// Does the next character still belong to the token?
c = [[self string] characterAtIndex: [self scanLocation]];
if (![[NSCharacterSet alphanumericCharacterSet] characterIsMember: c])
{
@ -1468,7 +1477,17 @@
{
NSPredicate *r;
r = [self parsePredicate];
NS_DURING
{
r = [self parsePredicate];
}
NS_HANDLER
{
NSLog(@"Parsing failed for %@ with %@", [self string], localException);
[localException raise];
}
NS_ENDHANDLER
if (![self isAtEnd])
{
[NSException raise: NSInvalidArgumentException
@ -1541,7 +1560,7 @@
return r;
}
if ([self scanPredicateKeyword: @"NOT"])
if ([self scanPredicateKeyword: @"NOT"] || [self scanPredicateKeyword: @"!"])
{
// -> NOT NOT x or NOT (y)
return [NSCompoundPredicate
@ -1649,7 +1668,8 @@
{
type = NSGreaterThanOrEqualToPredicateOperatorType;
}
else if ([self scanString: @"=" intoString: NULL])
else if ([self scanString: @"==" intoString: NULL] ||
[self scanString: @"=" intoString: NULL])
{
type = NSEqualToPredicateOperatorType;
}
@ -1677,10 +1697,18 @@
{
type = NSInPredicateOperatorType;
}
else if ([self scanPredicateKeyword: @"BETWEEN"])
{
// FIXME: Requires special handling to transfer into AND of
// two normal comparison predicates
[NSException raise: NSInvalidArgumentException
format: @"Support for BETWEEN operator is missing"];
}
else
{
[NSException raise: NSInvalidArgumentException
format: @"Invalid comparison predicate: %@",
format: @"Invalid comparison predicate: %@",
[[self string] substringFromIndex: [self scanLocation]]];
}
@ -1771,16 +1799,19 @@
return nil;
}
if ([self scanPredicateKeyword: @"NULL"])
if ([self scanPredicateKeyword: @"NULL"] ||
[self scanPredicateKeyword: @"NIL"])
{
return [NSExpression expressionForConstantValue: [NSNull null]];
}
if ([self scanPredicateKeyword: @"TRUE"])
if ([self scanPredicateKeyword: @"TRUE"] ||
[self scanPredicateKeyword: @"YES"])
{
return [NSExpression expressionForConstantValue:
[NSNumber numberWithBool: YES]];
}
if ([self scanPredicateKeyword: @"FALSE"])
if ([self scanPredicateKeyword: @"FALSE"] ||
[self scanPredicateKeyword: @"NO"])
{
return [NSExpression expressionForConstantValue:
[NSNumber numberWithBool: NO]];
@ -1812,7 +1843,8 @@
return [NSExpression expressionForConstantValue: [self nextArg]];
}
// FIXME: other formats
// FIXME: Missing other formats such as %d
if ([self scanString: @"\"" intoString: NULL])
{
NSString *str = @"string constant";