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

Add description method and a few minor changes

Browse source
This commit is contained in:
Gregory John Casamento 2024-05-26 16:16:40 -04:00
parent 0a440a5303
commit a49ae59a79
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Headers/Foundation/NSExpression.h
View file

@ -40,7 +40,7 @@ extern "C" {
enum
{
NSConstantValueExpressionType=0,
NSConstantValueExpressionType = 0,
NSEvaluatedObjectExpressionType,
NSVariableExpressionType,
NSKeyPathExpressionType,

38
Source/NSPredicate.m
View file

@ -169,6 +169,10 @@ extern void GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
@end
@interface GSAggregateExpression : NSExpression
{
@public
id _collection;
}
@end
@interface GSFunctionExpression : NSExpression
@ -1289,7 +1293,13 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
+ (NSExpression *) expressionForAggregate: (NSArray *)subExpressions
{
return nil;
GSAggregateExpression *e;
e = [[GSAggregateExpression alloc]
initWithExpressionType: NSAggregateExpressionType];
ASSIGN(e->_collection, [NSMutableArray array]);
return AUTORELEASE(e);
}
+ (NSExpression *) expressionForUnionSet: (NSExpression *)left
@ -1728,6 +1738,11 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
@implementation GSUnionSetExpression
- (NSString *) description
{
return [NSString stringWithFormat: @"%@.%@", _left, _right];
}
- (NSExpression *) leftExpression
{
return _left;
@ -1742,6 +1757,11 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
@implementation GSIntersectSetExpression
- (NSString *) description
{
return [NSString stringWithFormat: @"%@.%@", _left, _right];
}
- (NSExpression *) leftExpression
{
return _left;
@ -1756,6 +1776,11 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
@implementation GSMinusSetExpression
- (NSString *) description
{
return [NSString stringWithFormat: @"%@.%@", _left, _right];
}
- (NSExpression *) leftExpression
{
return _left;
@ -1772,6 +1797,17 @@ GSICUStringMatchesRegex(NSString *string, NSString *regex, NSStringCompareOption
@end
@implementation GSAggregateExpression
- (NSString *) description
{
return [NSString stringWithFormat: @"%@", _collection];
}
- (id) collection
{
return _collection;
}
@end
@implementation GSFunctionExpression