colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-04 08:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Coding style

Browse Source
This commit is contained in:
cacaodev committed 2015-12-27 22:03:35 +01:00
1 parent 117ac0f5d6
commit f1591e593a
2 files changed
+11 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Foundation/CPPredicate/_CPConditionalExpression.j
+6 -6
View File
@@ -70,19 +70,19 @@
- (id)expressionValueWithObject:(id)object context:(CPDictionary)context
{
var eval = [_predicate evaluateWithObject:object substitutionVariables:context];
var exp = eval ? _trueExpression : _falseExpression;
var eval = [_predicate evaluateWithObject:object substitutionVariables:context],
exp = eval ? _trueExpression : _falseExpression;
return [exp expressionValueWithObject:object context:context];
}
- (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)bindings
{
var s_predicate = [_predicate predicateWithSubstitutionVariables:bindings],
s_trueExp = [_trueExpression _expressionWithSubstitutionVariables:bindings],
s_falseExp = [_falseExpression _expressionWithSubstitutionVariables:bindings];
var predicate = [_predicate predicateWithSubstitutionVariables:bindings],
trueExp = [_trueExpression _expressionWithSubstitutionVariables:bindings],
falseExp = [_falseExpression _expressionWithSubstitutionVariables:bindings];
return [[_CPConditionalExpression alloc] initWithPredicate:s_predicate trueExpression:s_trueExp falseExpression:s_falseExp];
return [[_CPConditionalExpression alloc] initWithPredicate:predicate trueExpression:trueExp falseExpression:falseExp];
}
- (CPString)description
Foundation/CPPredicate/_CPPredicate.j
+5 -2
View File
@@ -744,10 +744,12 @@
if (![self scanString:@"," intoString:NULL])
CPRaiseParseError(self, @"expression");
variableExpression = [self parseExpression];
if (![self scanString:@"," intoString:NULL])
CPRaiseParseError(self, @"expression");
subpredicate = [self parsePredicate];
if (![self scanString:@")" intoString:NULL])
@@ -761,19 +763,20 @@
if (![self scanString:@"(" intoString:NULL])
CPRaiseParseError(self, @"expression");
var predicate,
var predicate = [self parsePredicate],
trueExpression,
falseExpression;
predicate = [self parsePredicate];
if (![self scanString:@"," intoString:NULL])
CPRaiseParseError(self, @"predicate");
trueExpression = [self parseExpression];
if (![self scanString:@"," intoString:NULL])
CPRaiseParseError(self, @"expression");
falseExpression = [self parseExpression];
if (![self scanString:@")" intoString:NULL])
CPRaiseParseError(self, @"expression");