mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-08-26 05:27:03 +00:00
cacaodev
2a95523577
Parsing: fixed typos in built-in function names, fixed support for [FIRST], [LAST], [INDEX]
Fixed aggregates {exp1,exp2}
Fixed -expressionForFunction:selectorName:arguments:
built-in functions are now class methods
Cleaned a lot of code in built-in functions
EvaluatedObjectExpression is now a singleton
Merged inserset/minus/union Set into one file
Deleted unused expression subclasses : expression_operator and expression_assignement
Added CPCoding methods and changed key names to match Cocoa
Made KeyPathExpresion a subclass of FunctionExpression like in Cocoa
Tests
74 lines
1.4 KiB
Plaintext
74 lines
1.4 KiB
Plaintext
|
|
@import "CPExpression.j"
|
|
@import <Foundation/CPString.j>
|
|
@import <Foundation/CPDictionary.j>
|
|
|
|
@implementation CPExpression_variable : CPExpression
|
|
{
|
|
CPString _variable;
|
|
}
|
|
|
|
- (id)initWithVariable:(CPString)variable
|
|
{
|
|
[super initWithExpressionType:CPVariableExpressionType];
|
|
_variable = [variable copy];
|
|
|
|
return self;
|
|
}
|
|
|
|
- (BOOL)isEqual:(id)object
|
|
{
|
|
if (self == object)
|
|
return YES;
|
|
|
|
if (object.isa != self.isa || [object expressionType] != [self expressionType] || ![[object variable] isEqualToString:[self variable]])
|
|
return NO;
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (CPString)variable
|
|
{
|
|
return _variable;
|
|
}
|
|
|
|
- (id)expressionValueWithObject:object context:(CPDictionary)context
|
|
{
|
|
return [context objectForKey:_variable];
|
|
}
|
|
|
|
- (CPString)description
|
|
{
|
|
return [CPString stringWithFormat:@"$%s", _variable];
|
|
}
|
|
|
|
- (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)variables
|
|
{
|
|
var aconstant = [variables objectForKey:_variable];
|
|
|
|
if (aconstant != nil)
|
|
return [CPExpression expressionForConstantValue:aconstant];
|
|
|
|
return self;
|
|
}
|
|
|
|
@end
|
|
|
|
var CPVariableKey = @"CPVariable";
|
|
|
|
@implementation CPExpression_variable (CPCoding)
|
|
|
|
- (id)initWithCoder:(CPCoder)coder
|
|
{
|
|
var variable = [coder decodeObjectForKey:CPVariableKey];
|
|
return [self initWithVariable:variable];
|
|
}
|
|
|
|
- (void)encodeWithCoder:(CPCoder)coder
|
|
{
|
|
[coder encodeObject:_variable forKey:CPVariableKey];
|
|
}
|
|
|
|
@end
|
|
|