starred/CoreStore-JohnEstropia
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-04-25 18:18:45 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
John Estropia
2017-07-04 12:21:46 +09:00
parent 961f39a806
commit a11915db12
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Sources/Where.swift
View File

@@ -50,13 +50,11 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func && (left: Where, right: Where?) -> Where {
if right != nil {
return left && right!
}
else {
if let right = right {
return left
return left && right
}
return left
}
/**
@@ -67,14 +65,12 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func && (left: Where?, right: Where) -> Where {
if left != nil {
if let left = left {
return left && right
}
else {
return right
}
}
/**
Combines two `Where` predicates together using `OR` operator
@@ -92,13 +88,11 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func || (left: Where, right: Where?) -> Where {
if right != nil {
return left || right!
}
else {
if let right = right {
return left
return left || right
}
return left
}
/**
@@ -109,14 +103,12 @@ public struct Where: FetchClause, QueryClause, DeleteClause, Hashable {
*/
public static func || (left: Where?, right: Where) -> Where {
if left != nil {
if let left = left {
return left || right
}
else {
return right
}
}
/**
Inverts the predicate of a `Where` clause using `NOT` operator