gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes for #47618

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@40462 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2017-04-09 12:45:18 +00:00
parent 073fb54804
commit 1f786ad7a8
3 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2017-04-09 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPredicate.m:
* Tests/base/NSPredicate/basic.m:
Fixes for bug #47618.
2017-04-09 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSTask.h:

67
Source/NSPredicate.m
View file

@ -362,10 +362,10 @@ extern void GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (BOOL) evaluateWithObject: (id)object
substitutionVariables: (GS_GENERIC_CLASS(NSDictionary, NSString*, id)*)variables
substitutionVariables: (GS_GENERIC_CLASS(NSDictionary, NSString*, id)*)variables
{
return [[self predicateWithSubstitutionVariables: variables]
evaluateWithObject: object];
evaluateWithObject: object];
}
#endif
- (Class) classForCoder
@ -898,15 +898,6 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
BOOL leftIsNil;
BOOL rightIsNil;
if (leftResult == evaluatedObjectExpression)
{
leftResult = object;
}
if (rightResult == evaluatedObjectExpression)
{
rightResult = object;
}
leftIsNil = (leftResult == nil || [leftResult isEqual: [NSNull null]]);
rightIsNil = (rightResult == nil || [rightResult isEqual: [NSNull null]]);
if (leftIsNil || rightIsNil)
@ -949,17 +940,29 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
switch (_type)
{
case NSLessThanPredicateOperatorType:
return ([leftResult compare: rightResult] == NSOrderedAscending)
? YES : NO;
{
double ld = [leftResult doubleValue];
double rd = [rightResult doubleValue];
return (ld < rd) ? YES : NO;
}
case NSLessThanOrEqualToPredicateOperatorType:
return ([leftResult compare: rightResult] != NSOrderedDescending)
? YES : NO;
{
double ld = [leftResult doubleValue];
double rd = [rightResult doubleValue];
return (ld <= rd) ? YES : NO;
}
case NSGreaterThanPredicateOperatorType:
return ([leftResult compare: rightResult] == NSOrderedDescending)
? YES : NO;
{
double ld = [leftResult doubleValue];
double rd = [rightResult doubleValue];
return (ld > rd) ? YES : NO;
}
case NSGreaterThanOrEqualToPredicateOperatorType:
return ([leftResult compare: rightResult] != NSOrderedAscending)
? YES : NO;
{
double ld = [leftResult doubleValue];
double rd = [rightResult doubleValue];
return (ld >= rd) ? YES : NO;
}
case NSEqualToPredicateOperatorType:
return [leftResult isEqual: rightResult];
case NSNotEqualToPredicateOperatorType:
@ -1070,11 +1073,6 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
NSEnumerator *e;
id value;
if (leftValue == evaluatedObjectExpression)
{
leftValue = object;
}
if (![leftValue respondsToSelector: @selector(objectEnumerator)])
{
[NSException raise: NSInvalidArgumentException
@ -1356,7 +1354,7 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
- (id) expressionValueWithObject: (id)object
context: (NSMutableDictionary *)context
{
return self;
return object;
}
- (id) _expressionWithSubstitutionVariables: (NSDictionary *)variables
@ -1364,6 +1362,10 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
return self;
}
- (NSString *) keyPath
{
return @"SELF";
}
@end
@implementation GSVariableExpression
@ -2525,10 +2527,17 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
format: @"Invalid right keypath: %@", left];
}
// concatenate
left = [NSExpression expressionForKeyPath:
[NSString stringWithFormat: @"%@.%@",
[left keyPath], [right keyPath]]];
if (evaluatedObjectExpression != left)
{
// concatenate
left = [NSExpression expressionForKeyPath:
[NSString stringWithFormat: @"%@.%@",
[left keyPath], [right keyPath]]];
}
else
{
left = [NSExpression expressionForKeyPath: [right keyPath]];
}
}
else
{

5
Tests/base/NSPredicate/basic.m
View file

@ -205,6 +205,11 @@ int main()
p = [NSPredicate predicateWithFormat: @"SELF == 'aaa'"];
PASS([p evaluateWithObject: @"aaa"], "SELF equality works");
d = [NSDictionary dictionaryWithObjectsAndKeys:
@"2", @"foo", nil];
p = [NSPredicate predicateWithFormat: @"SELF.foo <= 2"];
PASS([p evaluateWithObject: d], "SELF.foo <= 2");
p = [NSPredicate predicateWithFormat:
@"%K like %@+$b+$c", @"$single", @"b\""];
PASS_EQUAL([p predicateFormat], @"$single LIKE (\"b\\\"\" + $b) + $c",