Skip to content

Unify naming of chunks a bit more #74

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

Merged
phausler merged 1 commit into from
Mar 14, 2022
Merged

Unify naming of chunks a bit more #74

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
6 changes: 2 additions & 4 deletions Sources/AsyncAlgorithms/AsyncChunkedByGroupSequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,15 @@
//===----------------------------------------------------------------------===//

extension AsyncSequence {

@inlinable
public func chunked<Collected: RangeReplaceableCollection>(by belongInSameGroup: @escaping @Sendable (Element, Element) -> Bool, into: Collected.Type) -> AsyncChunkedByGroupSequence<Self, Collected> where Collected.Element == Element {
public func chunked<Collected: RangeReplaceableCollection>(into: Collected.Type, by belongInSameGroup: @escaping @Sendable (Element, Element) -> Bool) -> AsyncChunkedByGroupSequence<Self, Collected> where Collected.Element == Element {
AsyncChunkedByGroupSequence(self, grouping: belongInSameGroup)
}

@inlinable
public func chunked(by belongInSameGroup: @escaping @Sendable (Element, Element) -> Bool) -> AsyncChunkedByGroupSequence<Self, [Element]> {
chunked(by: belongInSameGroup, into: [Element].self)
chunked(into: [Element].self, by: belongInSameGroup)
}

}

public struct AsyncChunkedByGroupSequence<Base: AsyncSequence, Collected: RangeReplaceableCollection>: AsyncSequence where Collected.Element == Base.Element {
Expand Down
6 changes: 2 additions & 4 deletions Sources/AsyncAlgorithms/AsyncChunkedOnProjectionSequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,15 @@
//===----------------------------------------------------------------------===//

extension AsyncSequence {

@inlinable
public func chunked<Subject : Equatable, Collected: RangeReplaceableCollection>(on projection: @escaping @Sendable (Element) -> Subject, into: Collected.Type) -> AsyncChunkedOnProjectionSequence<Self, Subject, Collected> {
public func chunked<Subject : Equatable, Collected: RangeReplaceableCollection>(into: Collected.Type, on projection: @escaping @Sendable (Element) -> Subject) -> AsyncChunkedOnProjectionSequence<Self, Subject, Collected> {
AsyncChunkedOnProjectionSequence(self, projection: projection)
}

@inlinable
public func chunked<Subject : Equatable>(on projection: @escaping @Sendable (Element) -> Subject) -> AsyncChunkedOnProjectionSequence<Self, Subject, [Element]> {
chunked(on: projection, into: [Element].self)
chunked(into: [Element].self, on: projection)
}

}

public struct AsyncChunkedOnProjectionSequence<Base: AsyncSequence, Subject: Equatable, Collected: RangeReplaceableCollection>: AsyncSequence where Collected.Element == Base.Element {
Expand Down
28 changes: 13 additions & 15 deletions ...AsyncChunksOfCountAndSignalSequence.swift → .../AsyncChunksOfCountOrSignalSequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,40 @@
//===----------------------------------------------------------------------===//

extension AsyncSequence {

public func chunks<Signal, Collected: RangeReplaceableCollection>(ofCount count: Int, or signal: Signal, into: Collected.Type) -> AsyncChunksOfCountAndSignalSequence<Self, Collected, Signal> where Collected.Element == Element {
AsyncChunksOfCountAndSignalSequence(self, count: count, signal: signal)
public func chunks<Signal, Collected: RangeReplaceableCollection>(ofCount count: Int, or signal: Signal, into: Collected.Type) -> AsyncChunksOfCountOrSignalSequence<Self, Collected, Signal> where Collected.Element == Element {
AsyncChunksOfCountOrSignalSequence(self, count: count, signal: signal)
}

public func chunks<Signal>(ofCount count: Int, or signal: Signal) -> AsyncChunksOfCountAndSignalSequence<Self, [Element], Signal> {
public func chunks<Signal>(ofCount count: Int, or signal: Signal) -> AsyncChunksOfCountOrSignalSequence<Self, [Element], Signal> {
chunks(ofCount: count, or: signal, into: [Element].self)
}

public func chunked<Signal, Collected: RangeReplaceableCollection>(by signal: Signal, into: Collected.Type) -> AsyncChunksOfCountAndSignalSequence<Self, Collected, Signal> where Collected.Element == Element {
AsyncChunksOfCountAndSignalSequence(self, count: nil, signal: signal)
public func chunked<Signal, Collected: RangeReplaceableCollection>(by signal: Signal, into: Collected.Type) -> AsyncChunksOfCountOrSignalSequence<Self, Collected, Signal> where Collected.Element == Element {
AsyncChunksOfCountOrSignalSequence(self, count: nil, signal: signal)
}

public func chunked<Signal>(bySignal signal: Signal) -> AsyncChunksOfCountAndSignalSequence<Self, [Element], Signal> {
public func chunked<Signal>(by signal: Signal) -> AsyncChunksOfCountOrSignalSequence<Self, [Element], Signal> {
chunked(by: signal, into: [Element].self)
}

public func chunks<C: Clock, Collected: RangeReplaceableCollection>(ofCount count: Int, or timer: AsyncTimerSequence<C>, into: Collected.Type) -> AsyncChunksOfCountAndSignalSequence<Self, Collected, AsyncTimerSequence<C>> where Collected.Element == Element {
AsyncChunksOfCountAndSignalSequence(self, count: count, signal: timer)
public func chunks<C: Clock, Collected: RangeReplaceableCollection>(ofCount count: Int, or timer: AsyncTimerSequence<C>, into: Collected.Type) -> AsyncChunksOfCountOrSignalSequence<Self, Collected, AsyncTimerSequence<C>> where Collected.Element == Element {
AsyncChunksOfCountOrSignalSequence(self, count: count, signal: timer)
}

public func chunks<C: Clock>(ofCount count: Int, or timer: AsyncTimerSequence<C>) -> AsyncChunksOfCountAndSignalSequence<Self, [Element], AsyncTimerSequence<C>> {
public func chunks<C: Clock>(ofCount count: Int, or timer: AsyncTimerSequence<C>) -> AsyncChunksOfCountOrSignalSequence<Self, [Element], AsyncTimerSequence<C>> {
chunks(ofCount: count, or: timer, into: [Element].self)
}

public func chunked<C: Clock, Collected: RangeReplaceableCollection>(by timer: AsyncTimerSequence<C>, into: Collected.Type) -> AsyncChunksOfCountAndSignalSequence<Self, Collected, AsyncTimerSequence<C>> where Collected.Element == Element {
AsyncChunksOfCountAndSignalSequence(self, count: nil, signal: timer)
public func chunked<C: Clock, Collected: RangeReplaceableCollection>(by timer: AsyncTimerSequence<C>, into: Collected.Type) -> AsyncChunksOfCountOrSignalSequence<Self, Collected, AsyncTimerSequence<C>> where Collected.Element == Element {
AsyncChunksOfCountOrSignalSequence(self, count: nil, signal: timer)
}

public func chunked<C: Clock>(by timer: AsyncTimerSequence<C>) -> AsyncChunksOfCountAndSignalSequence<Self, [Element], AsyncTimerSequence<C>> {
public func chunked<C: Clock>(by timer: AsyncTimerSequence<C>) -> AsyncChunksOfCountOrSignalSequence<Self, [Element], AsyncTimerSequence<C>> {
chunked(by: timer, into: [Element].self)
}

}

public struct AsyncChunksOfCountAndSignalSequence<Base: AsyncSequence, Collected: RangeReplaceableCollection, Signal: AsyncSequence>: AsyncSequence, Sendable where Collected.Element == Base.Element, Base: Sendable, Signal: Sendable, Base.AsyncIterator: Sendable, Signal.AsyncIterator: Sendable, Base.Element: Sendable, Signal.Element: Sendable {
public struct AsyncChunksOfCountOrSignalSequence<Base: AsyncSequence, Collected: RangeReplaceableCollection, Signal: AsyncSequence>: AsyncSequence, Sendable where Collected.Element == Base.Element, Base: Sendable, Signal: Sendable, Base.AsyncIterator: Sendable, Signal.AsyncIterator: Sendable, Base.Element: Sendable, Signal.Element: Sendable {

public typealias Element = Collected

Expand Down
2 changes: 0 additions & 2 deletions Sources/AsyncAlgorithms/AsyncChunksOfCountSequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//===----------------------------------------------------------------------===//

extension AsyncSequence {

@inlinable
public func chunks<Collected: RangeReplaceableCollection>(ofCount count: Int, into: Collected.Type) -> AsyncChunksOfCountSequence<Self, Collected> where Collected.Element == Element {
AsyncChunksOfCountSequence(self, count: count)
Expand All @@ -20,7 +19,6 @@ extension AsyncSequence {
public func chunks(ofCount count: Int) -> AsyncChunksOfCountSequence<Self, [Element]> {
chunks(ofCount: count, into: [Element].self)
}

}

public struct AsyncChunksOfCountSequence<Base: AsyncSequence, Collected: RangeReplaceableCollection>: AsyncSequence where Collected.Element == Base.Element {
Expand Down
10 changes: 5 additions & 5 deletions Tests/AsyncAlgorithmsTests/TestChunk.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class TestChunk: XCTestCase {
validate {
"ABC- DEF- GHI- |"
"---X ---X ---X |"
$0.inputs[0].chunked(bySignal: $0.inputs[1]).map(concatCharacters)
$0.inputs[0].chunked(by: $0.inputs[1]).map(concatCharacters)
"---'ABC'---'DEF'---'GHI'|"
}
}
Expand All @@ -36,7 +36,7 @@ final class TestChunk: XCTestCase {
validate {
"AB- A-ABCDEFGH- |"
"--X -X--------X |"
$0.inputs[0].chunked(bySignal: $0.inputs[1]).map(concatCharacters)
$0.inputs[0].chunked(by: $0.inputs[1]).map(concatCharacters)
"--'AB'-A--------'ABCDEFGH'|"
}
}
Expand All @@ -45,7 +45,7 @@ final class TestChunk: XCTestCase {
validate {
"--1--|"
"XX-XX|"
$0.inputs[0].chunked(bySignal: $0.inputs[1]).map(concatCharacters)
$0.inputs[0].chunked(by: $0.inputs[1]).map(concatCharacters)
"---1-|"
}
}
Expand All @@ -54,7 +54,7 @@ final class TestChunk: XCTestCase {
validate {
"AB^"
"---X|"
$0.inputs[0].chunked(bySignal: $0.inputs[1]).map(concatCharacters)
$0.inputs[0].chunked(by: $0.inputs[1]).map(concatCharacters)
"--^"
}
}
Expand All @@ -63,7 +63,7 @@ final class TestChunk: XCTestCase {
validate {
"111-111|"
"---X---|"
$0.inputs[0].chunked(bySignal: $0.inputs[1]).map(sumCharacters)
$0.inputs[0].chunked(by: $0.inputs[1]).map(sumCharacters)
"---3---[3|]"
}
}
Expand Down