starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-01-17 22:46:51 +01: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
committed by John Rommel Estropia
parent f62137fb58
commit f5e1643ef7
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Sources/Where.swift
View File

@@ -50,13 +50,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
*/
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,13 +65,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
*/
public static func && (left: Where?, right: Where) -> Where {
if left != nil {
if let left = left {
return left && right
}
else {
return right
}
return right
}
/**
@@ -92,13 +88,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
*/
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,13 +103,11 @@ public struct Where<D: DynamicObject>: WhereClause, FetchClause, QueryClause, De
*/
public static func || (left: Where?, right: Where) -> Where {
if left != nil {
if let left = left {
return left || right
}
else {
return right
}
return right
}
/**