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

Fixed: Method isEqual: can handle nil as an argument for CPExpression and CPPredicate including sub classes.

Browse Source
This commit is contained in:
Martin Carlberg
2013-04-23 12:58:07 +02:00
parent 8a94c33a64
commit ffdee8c3d7
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPPredicate/CPComparisonPredicate.j
+1 -1
View File
@@ -275,7 +275,7 @@ var CPComparisonPredicateModifier,
if (self === anObject)
return YES;
if (anObject.isa !== self.isa || _modifier !== [anObject comparisonPredicateModifier] || _type !== [anObject predicateOperatorType] || _options !== [anObject options] || _customSelector !== [anObject customSelector] || ![_left isEqual:[anObject leftExpression]] || ![_right isEqual:[anObject rightExpression]])
if (anObject === nil || anObject.isa !== self.isa || _modifier !== [anObject comparisonPredicateModifier] || _type !== [anObject predicateOperatorType] || _options !== [anObject options] || _customSelector !== [anObject customSelector] || ![_left isEqual:[anObject leftExpression]] || ![_right isEqual:[anObject rightExpression]])
return NO;
return YES;
Foundation/CPPredicate/CPCompoundPredicate.j
+1 -1
View File
@@ -215,7 +215,7 @@ var CPCompoundPredicateType;
if (self === anObject)
return YES;
if (anObject.isa !== self.isa || _type !== [anObject compoundPredicateType] || ![_predicates isEqualToArray:[anObject subpredicates]])
if (anObject === nil || anObject.isa !== self.isa || _type !== [anObject compoundPredicateType] || ![_predicates isEqualToArray:[anObject subpredicates]])
return NO;
return YES;
Foundation/CPPredicate/_CPAggregateExpression.j
+1 -1
View File
@@ -42,7 +42,7 @@
if (self === object)
return YES;
if (object.isa !== self.isa || ![[object collection] isEqual:_aggregate])
if (object === nil || object.isa !== self.isa || ![[object collection] isEqual:_aggregate])
return NO;
return YES;
Foundation/CPPredicate/_CPConstantValueExpression.j
+1 -1
View File
@@ -45,7 +45,7 @@
if (self === object)
return YES;
if (object.isa !== self.isa || ![[object constantValue] isEqual:_value])
if (object === nil || object.isa !== self.isa || ![[object constantValue] isEqual:_value])
return NO;
return YES;
Foundation/CPPredicate/_CPFunctionExpression.j
+1 -1
View File
@@ -72,7 +72,7 @@
if (self === object)
return YES;
if (object.isa !== self.isa || ![[object _function] isEqual:_selector] || ![[object operand] isEqual:_operand] || ![[object arguments] isEqualToArray:_arguments])
if (object === nil || object.isa !== self.isa || ![[object _function] isEqual:_selector] || ![[object operand] isEqual:_operand] || ![[object arguments] isEqualToArray:_arguments])
return NO;
return YES;
Foundation/CPPredicate/_CPKeyPathExpression.j
+1 -1
View File
@@ -51,7 +51,7 @@
if (object === self)
return YES;
if (object.isa !== self.isa || ![[object keyPath] isEqualToString:[self keyPath]])
if (object === nil || object.isa !== self.isa || ![[object keyPath] isEqualToString:[self keyPath]])
return NO;
return YES;
Foundation/CPPredicate/_CPPredicate.j
+1 -1
View File
@@ -190,7 +190,7 @@
if (self === anObject)
return YES;
if (self.isa !== anObject.isa || _value !== [anObject evaluateWithObject:nil])
if (anObject === nil || self.isa !== anObject.isa || _value !== [anObject evaluateWithObject:nil])
return NO;
return YES;
Foundation/CPPredicate/_CPSetExpression.j
+1 -1
View File
@@ -47,7 +47,7 @@
if (self === object)
return YES;
if (object.isa !== self.isa || ![[object leftExpression] isEqual:_left] || ![[object rightExpression] isEqual:_right])
if (object === nil || object.isa !== self.isa || ![[object leftExpression] isEqual:_left] || ![[object rightExpression] isEqual:_right])
return NO;
return YES;
Foundation/CPPredicate/_CPSubqueryExpression.j
+1 -1
View File
@@ -73,7 +73,7 @@
if (self === object)
return YES;
if (object.isa !== self.isa || ![_collection isEqual:[object collection]] || ![_variableExpression isEqual:[object variableExpression]] || ![_subpredicate isEqual:[object predicate]])
if (object === nil || object.isa !== self.isa || ![_collection isEqual:[object collection]] || ![_variableExpression isEqual:[object variableExpression]] || ![_subpredicate isEqual:[object predicate]])
return NO;
return YES;
Foundation/CPPredicate/_CPVariableExpression.j
+1 -1
View File
@@ -48,7 +48,7 @@
if (self === object)
return YES;
if (object.isa !== self.isa || ![[object variable] isEqual:_variable])
if (object === nil || object.isa !== self.isa || ![[object variable] isEqual:_variable])
return NO;
return YES;