From f1591e593a2e62cf4ed26bc14cf140b03c0a2801 Mon Sep 17 00:00:00 2001
From: cacaodev <cacaodev@gmail.com>
Date: Sun, 27 Dec 2015 22:03:35 +0100
Subject: [PATCH] Coding style

---
 Foundation/CPPredicate/_CPConditionalExpression.j | 12 ++++++------
 Foundation/CPPredicate/_CPPredicate.j             |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Foundation/CPPredicate/_CPConditionalExpression.j b/Foundation/CPPredicate/_CPConditionalExpression.j
index 1f939a64e..86926e392 100644
--- a/Foundation/CPPredicate/_CPConditionalExpression.j
+++ b/Foundation/CPPredicate/_CPConditionalExpression.j
@@ -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
diff --git a/Foundation/CPPredicate/_CPPredicate.j b/Foundation/CPPredicate/_CPPredicate.j
index 57192ab65..34001c415 100644
--- a/Foundation/CPPredicate/_CPPredicate.j
+++ b/Foundation/CPPredicate/_CPPredicate.j
@@ -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");