mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-08-28 14:37:04 +00:00
cacaodev
4b1fbf1eff
Added missing getters in CPExpression. Added a type: argument to FunctionExpression initializer used by subclasses to init super with their own type. Fixed evaluation with bindings dictionary in CPExpression_variable. Allow values in bindings to be a constant or an expression (per cocoa). Tests: added tests for subqueryExpressions, for variableExpression evaluation where the value in the bindings dictionary can be either a constant or another expression. Parsing a simple variable expression works (e.g. '$x = 12'), parsing a variable in a combined path (e.g. '$x.path = 12' won't yet.
93 lines
2.0 KiB
Plaintext
93 lines
2.0 KiB
Plaintext
|
|
@import "CPExpression.j"
|
|
@import <Foundation/CPArray.j>
|
|
@import <Foundation/CPString.j>
|
|
|
|
@implementation CPExpression_aggregate : CPExpression
|
|
{
|
|
CPArray _aggregate;
|
|
}
|
|
|
|
- (id)initWithAggregate:(CPArray)collection
|
|
{
|
|
[super initWithExpressionType:CPAggregateExpressionType];
|
|
_aggregate = collection;
|
|
return self;
|
|
}
|
|
|
|
- (BOOL)isEqual:(id)object
|
|
{
|
|
if (self == object)
|
|
return YES;
|
|
|
|
if (object.isa != self.isa || [object expressionType] != [self expressionType] || ![[object collection] isEqual:[self collection]])
|
|
return NO;
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (id)collection
|
|
{
|
|
return _aggregate;
|
|
}
|
|
|
|
- (id)expressionValueWithObject:(id)object context:(CPDictionary)context
|
|
{
|
|
var eval_array = [CPArray array],
|
|
collection = [_aggregate objectEnumerator],
|
|
exp;
|
|
|
|
while (exp = [collection nextObject])
|
|
{
|
|
var eval = [exp expressionValueWithObject:object context:context];
|
|
[eval_array addObject:eval];
|
|
}
|
|
|
|
return eval_array;
|
|
}
|
|
|
|
- (CPString)description
|
|
{
|
|
var i,
|
|
count = [_aggregate count],
|
|
result = "{";
|
|
|
|
for (i = 0; i < count; i++)
|
|
result = result + [CPString stringWithFormat:@"%s%s", [[_aggregate objectAtIndex:i] description], (i + 1 < count) ? @", " : @""];
|
|
|
|
result = result + "}";
|
|
|
|
return result;
|
|
}
|
|
|
|
- (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)variables
|
|
{
|
|
var subst_array = [CPArray array],
|
|
count = [_aggregate count],
|
|
i;
|
|
|
|
for (i = 0; i < count; i++)
|
|
[subst_array addObject:[[_aggregate objectAtIndex:i] _expressionWithSubstitutionVariables:variables]];
|
|
|
|
return [CPExpression expressionForAggregate:subst_array];
|
|
}
|
|
|
|
@end
|
|
|
|
var CPCollectionKey = @"CPCollection";
|
|
|
|
@implementation CPExpression_aggregate (CPCoding)
|
|
|
|
- (id)initWithCoder:(CPCoder)coder
|
|
{
|
|
var collection = [coder decodeObjectForKey:CPCollectionKey];
|
|
return [self initWithAggregate:collection];
|
|
}
|
|
|
|
- (void)encodeWithCoder:(CPCoder)coder
|
|
{
|
|
[coder encodeObject:_aggregate forKey:CPCollectionKey];
|
|
}
|
|
|
|
@end
|