Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
46 changes: 46 additions & 0 deletions Sources/FoundationEssentials/Predicate/Predicate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,52 @@ extension Predicate {
}
}

@available(FoundationPreview 6.4, *)
extension Predicate {
public init(all subpredicates: some BidirectionalCollection<Self>) {
var iterator = subpredicates.reversed().makeIterator()

if let guarded = iterator.next() {
self.init({ (input: repeat PredicateExpressions.Variable<each Input>) in
var pieces: any StandardPredicateExpression<Bool> = PredicateExpressions.build_evaluate(PredicateExpressions.build_Arg(guarded), repeat each input)

while let next = iterator.next() {
pieces = Self.meet(PredicateExpressions.build_evaluate(PredicateExpressions.build_Arg(next), repeat each input), pieces)
}

return pieces
})
} else {
self.init(value: true)
}
}

public init(any subpredicates: some BidirectionalCollection<Self>) {
var iterator = subpredicates.reversed().makeIterator()

if let guarded = iterator.next() {
self.init({ (input: repeat PredicateExpressions.Variable<each Input>) in
var pieces: any StandardPredicateExpression<Bool> = PredicateExpressions.build_evaluate(PredicateExpressions.build_Arg(guarded), repeat each input)

while let next = iterator.next() {
pieces = Self.join(PredicateExpressions.build_evaluate(PredicateExpressions.build_Arg(next), repeat each input), pieces)
}

return pieces
})
} else {
self.init(value: false)
}
}

fileprivate static func meet<T: StandardPredicateExpression<Bool>, U: StandardPredicateExpression<Bool>>(_ lhs: T, _ rhs: U) -> any StandardPredicateExpression<Bool> {
PredicateExpressions.build_Conjunction(lhs: lhs, rhs: rhs)
}

fileprivate static func join<T: StandardPredicateExpression<Bool>, U: StandardPredicateExpression<Bool>>(_ lhs: T, _ rhs: U) -> any StandardPredicateExpression<Bool> {
PredicateExpressions.build_Disjunction(lhs: lhs, rhs: rhs)
}
}

// Namespace for operator expressions
@available(macOS 14, iOS 17, tvOS 17, watchOS 10, *)
Expand Down
120 changes: 120 additions & 0 deletions Tests/FoundationEssentialsTests/PredicateTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,36 @@ struct PredicateTestObject2 {
var a: Bool
}

fileprivate class PredicateTestObject3 {
private let firstValue: Bool
private let secondValue: Bool
private let thirdValue: Bool

private(set) var firstAccessed = false
private(set) var secondAccessed = false
private(set) var thirdAccessed = false

var first: Bool {
firstAccessed = true
return firstValue
}

var second: Bool {
secondAccessed = true
return secondValue
}

var third: Bool {
thirdAccessed = true
return thirdValue
}

init(first: Bool, second: Bool, third: Bool) {
self.firstValue = first
self.secondValue = second
self.thirdValue = third
}
}

fileprivate protocol PredicateProducer {
var prop: Int { get }
Expand Down Expand Up @@ -541,4 +571,94 @@ private struct PredicateTests {
#expect(try expression.evaluate(i) == i + 1)
}
}

@Test func all() throws {
#expect(try Predicate(all: []).evaluate(42))
Comment thread
jmschonfeld marked this conversation as resolved.
#expect(try !Predicate(all: [Predicate.true, Predicate.false]).evaluate(42))
let input = Object(a: 6, b: "xyz", c: 0.27, d: 97, e: "u", f: false, g: [7, 42, 1, 0, 25])
var predicates: [Predicate<Object>] = [
#Predicate { $0.a == 6 },
#Predicate { $0.b == "xyz" },
#Predicate { $0.c < 0.3 },
#Predicate { $0.d == 97 },
#Predicate { $0.d % 2 != 0 },
#Predicate { !$0.f },
#Predicate { $0.g.contains(42) },
#Predicate { $0.g.min() == 0 }
]
#expect(try Predicate(all: predicates).evaluate(input))
predicates.append(#Predicate { $0.g.max() == 7 })
#expect(try !Predicate(all: predicates).evaluate(input))
predicates.append(#Predicate { $0.c < 0.0 })
#expect(try !Predicate(all: predicates).evaluate(input))
}
Comment thread
jmschonfeld marked this conversation as resolved.

@Test func allShortCircuitEvaluation() throws {
let predicates: [Predicate<PredicateTestObject3>] = [
#Predicate { $0.first },
#Predicate { $0.second },
#Predicate { $0.third }
]

let input1 = PredicateTestObject3(first: false, second: true, third: true)
#expect(try !Predicate(all: predicates).evaluate(input1))
#expect(input1.firstAccessed)
#expect(!input1.secondAccessed)
#expect(!input1.thirdAccessed)

let input2 = PredicateTestObject3(first: true, second: false, third: true)
#expect(try !Predicate(all: predicates).evaluate(input2))
#expect(input2.firstAccessed)
#expect(input2.secondAccessed)
#expect(!input2.thirdAccessed)

let input3 = PredicateTestObject3(first: true, second: true, third: true)
#expect(try Predicate(all: predicates).evaluate(input3))
#expect(input3.firstAccessed)
#expect(input3.secondAccessed)
#expect(input3.thirdAccessed)
}

@Test func any() throws {
#expect(try !Predicate(any: []).evaluate(42))
#expect(try Predicate(any: [Predicate.true, Predicate.false]).evaluate(42))
let input = Object(a: 6, b: "xyz", c: 0.27, d: 97, e: "u", f: false, g: [7, 42, 1, 0, 25])
let predicates: [Predicate<Object>] = [
#Predicate { $0.g.max() == 7 },
#Predicate { $0.c < 0.0 },
#Predicate { $0.a == 6 },
#Predicate { $0.b == "xyz" },
#Predicate { $0.c < 0.3 }
]
#expect(try Predicate(any: predicates.dropLast()).evaluate(input))
#expect(try Predicate(any: predicates.dropLast(2)).evaluate(input))
#expect(try !Predicate(any: predicates.dropLast(3)).evaluate(input))
#expect(try !Predicate(any: predicates.dropLast(4)).evaluate(input))
}

@Test func anyShortCircuitEvaluation() throws {
let predicates: [Predicate<PredicateTestObject3>] = [
#Predicate { $0.first },
#Predicate { $0.second },
#Predicate { $0.third }
]

let input1 = PredicateTestObject3(first: true, second: false, third: false)
#expect(try Predicate(any: predicates).evaluate(input1))
#expect(input1.firstAccessed)
#expect(!input1.secondAccessed)
#expect(!input1.thirdAccessed)

let input2 = PredicateTestObject3(first: false, second: true, third: false)
#expect(try Predicate(any: predicates).evaluate(input2))
#expect(input2.firstAccessed)
#expect(input2.secondAccessed)
#expect(!input2.thirdAccessed)

let input3 = PredicateTestObject3(first: false, second: false, third: false)
#expect(try !Predicate(any: predicates).evaluate(input3))
#expect(input3.firstAccessed)
#expect(input3.secondAccessed)
#expect(input3.thirdAccessed)
}
}
Loading