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

Small array keyword fixes for NSPredicate

Browse source
This commit is contained in:
Richard Frith-Macdonald 2023-10-08 13:48:33 +01:00
parent e58b83c1f3
commit 531d3b8559
3 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2023-10-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPredicate.m: fixup for array access keywords
* Tests/base/NSPredicate/basic.m: add simple testcases for array
2023-10-07 Gregory John Casamento <greg.casamento@gmail.com>
* Headers/Foundation/NSKeyValueObserving.h

6
Source/NSPredicate.m
View file

@ -2634,17 +2634,17 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
if ([self scanPredicateKeyword: @"FIRST"])
{
left = [NSExpression expressionForFunction: @"_first"
arguments: [NSArray arrayWithObject: [self parseExpression]]];
arguments: [NSArray arrayWithObject: left]];
}
else if ([self scanPredicateKeyword: @"LAST"])
{
left = [NSExpression expressionForFunction: @"_last"
arguments: [NSArray arrayWithObject: [self parseExpression]]];
arguments: [NSArray arrayWithObject: left]];
}
else if ([self scanPredicateKeyword: @"SIZE"])
{
left = [NSExpression expressionForFunction: @"count"
arguments: [NSArray arrayWithObject: [self parseExpression]]];
arguments: [NSArray arrayWithObject: left]];
}
else
{

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

@ -151,6 +151,28 @@ testBlock(NSDictionary* dict)
# endif
END_SET("Block predicates");
}
void testArray(void)
{
NSArray *array;
NSPredicate *predicate;
array = [NSArray arrayWithObjects:
[NSNumber numberWithInteger: 1],
[NSNumber numberWithInteger: 2],
[NSNumber numberWithInteger: 0],
nil];
predicate = [NSPredicate predicateWithFormat: @"SELF[FIRST] = 1"];
PASS([predicate evaluateWithObject: array], "first is one")
predicate = [NSPredicate predicateWithFormat: @"SELF[LAST] = 0"];
PASS([predicate evaluateWithObject: array], "last is zero")
predicate = [NSPredicate predicateWithFormat: @"SELF[SIZE] = 3"];
PASS([predicate evaluateWithObject: array], "size is three")
}
int main()
{
NSArray *filtered;
@ -257,6 +279,8 @@ int main()
PASS_EQUAL([a description], @"(yes)",
"predicate created with format can filter an array")
testArray();
END_SET("basic")
return 0;