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

Fix for #243

Browse source
This commit is contained in:
Richard Frith-Macdonald 2022-03-07 10:13:44 +00:00
parent 61d14215fa
commit ae72ee4593
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2022-03-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPredicate.m:
* Tests/base/NSPredicate/basic.m:
Fix for git #243
2022-02-25 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSDistantObject.m:

11
Source/NSPredicate.m
View file

@ -1019,15 +1019,22 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
#endif
case NSBeginsWithPredicateOperatorType:
{
NSRange range = NSMakeRange(0, [rightResult length]);
NSRange range;
NSUInteger ll = [leftResult length];
NSUInteger rl = [rightResult length];
if (rl > ll)
{
return NO;
}
range = NSMakeRange(0, rl);
return ([leftResult compare: rightResult
options: compareOptions
range: range] == NSOrderedSame ? YES : NO);
}
case NSEndsWithPredicateOperatorType:
{
NSRange range;
NSRange range;
NSUInteger ll = [leftResult length];
NSUInteger rl = [rightResult length];

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

@ -40,6 +40,13 @@ testString(NSDictionary *dict)
PASS([p evaluateWithObject: dict], "%%K BEGINSWITH %%@");
p = [NSPredicate predicateWithFormat: @"(%K == %@) AND (%K == %@)", @"Record1.Name", @"John", @"Record2.Name", @"Mary"];
PASS([p evaluateWithObject: dict], "(%%K == %%@) AND (%%K == %%@)");
NSMutableArray *strings = [NSMutableArray arrayWithObjects: @"a", @"aa",
@"aaa", @"aaaa", nil];
NSArray *expect = [NSMutableArray arrayWithObjects: @"aaa", @"aaaa", nil];
p = [NSPredicate predicateWithFormat: @"self beginswith 'aaa'"];
[strings filterUsingPredicate: p];
PASS_EQUAL(strings, expect, "filter using BEGINSWITH")
}
void