Skip to content

Support for nil comparisons without Equatable conformance #1765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatthewTurk247 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support for nil comparisons without Equatable conformance #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Sources/FoundationEssentials/Predicate/Expressions/Equality.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ extension PredicateExpressions {
}
}

@available(FoundationPreview 6.4, *)
extension PredicateExpressions {
public static func build_Equal<LHS, Wrapped>(lhs: LHS, rhs: NilLiteral<Wrapped>) -> Equal<OptionalFlatMap<LHS, Wrapped, Value<Bool>, Bool>, Value<Bool?>> {
Equal(lhs: OptionalFlatMap(lhs) { _ in Value(true) }, rhs: Value(nil))
}

public static func build_Equal<Wrapped, RHS>(lhs: NilLiteral<Wrapped>, rhs: RHS) -> Equal<Value<Bool?>, OptionalFlatMap<RHS, Wrapped, Value<Bool>, Bool>> {
Equal(lhs: Value(nil), rhs: OptionalFlatMap(rhs) { _ in Value(true) })
}
}

@available(macOS 14.4, iOS 17.4, tvOS 17.4, watchOS 10.4, *)
extension PredicateExpressions.Equal : CustomStringConvertible {
public var description: String {
Expand Down
11 changes: 11 additions & 0 deletions Sources/FoundationEssentials/Predicate/Expressions/Inequality.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,17 @@ extension PredicateExpressions {
}
}

@available(FoundationPreview 6.4, *)
extension PredicateExpressions {
public static func build_NotEqual<LHS, Wrapped>(lhs: LHS, rhs: NilLiteral<Wrapped>) -> NotEqual<OptionalFlatMap<LHS, Wrapped, Value<Bool>, Bool>, Value<Bool?>> {
NotEqual(lhs: OptionalFlatMap(lhs) { _ in Value(true) }, rhs: Value(nil))
}

public static func build_NotEqual<Wrapped, RHS>(lhs: NilLiteral<Wrapped>, rhs: RHS) -> NotEqual<Value<Bool?>, OptionalFlatMap<RHS, Wrapped, Value<Bool>, Bool>> {
NotEqual(lhs: Value(nil), rhs: OptionalFlatMap(rhs) { _ in Value(true) })
}
}

@available(macOS 14.4, iOS 17.4, tvOS 17.4, watchOS 10.4, *)
extension PredicateExpressions.NotEqual : CustomStringConvertible {
public var description: String {
Expand Down
12 changes: 12 additions & 0 deletions Tests/FoundationEssentialsTests/PredicateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,4 +541,16 @@ private struct PredicateTests {
#expect(try expression.evaluate(i) == i + 1)
}
}

@Test(arguments: [#Predicate<Object?> { $0 == nil }, #Predicate<Object?> { nil == $0 }])
func nilLiteral(equality: Predicate<Object?>) throws {
#expect(try equality.evaluate(nil))
#expect(try !equality.evaluate(Object(a: 9, b: "abc", c: 0.72, d: 64, e: "c", f: true, g: [5, 7, 5, 1])))
}

@Test(arguments: [#Predicate<Object?> { $0 != nil }, #Predicate<Object?> { nil != $0 }])
func nilLiteral(inequality: Predicate<Object?>) throws {
#expect(try !inequality.evaluate(nil))
#expect(try inequality.evaluate(Object(a: 9, b: "abc", c: 0.72, d: 64, e: "c", f: true, g: [5, 7, 5, 1])))
}
}