-
Notifications
You must be signed in to change notification settings - Fork 87
Add scala.collection.Factory #8
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.
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
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package scala.collection | ||
|
||
import scala.collection.generic.CanBuildFrom | ||
|
||
/** | ||
* A factory that builds a collection of type `C` with elements of type `A`. | ||
* | ||
* @tparam A Type of elements (e.g. `Int`, `Boolean`, etc.) | ||
* @tparam C Type of collection (e.g. `List[Int]`, `TreeMap[Int, String]`, etc.) | ||
*/ | ||
trait Factory[-A, +C] extends Any { | ||
|
||
/** | ||
* @return A collection of type `C` containing the same elements | ||
* as the source collection `it`. | ||
* @param it Source collection | ||
*/ | ||
def fromSpecific(it: TraversableOnce[A]): C | ||
|
||
/** Get a Builder for the collection. For non-strict collection types this will use an intermediate buffer. | ||
* Building collections with `fromSpecific` is preferred because it can be lazy for lazy collections. */ | ||
def newBuilder(): mutable.Builder[A, C] | ||
} | ||
|
||
object Factory { | ||
|
||
implicit def fromCanBuildFrom[A, C](implicit cbf: CanBuildFrom[Nothing, A, C]): Factory[A, C] = | ||
new Factory[A, C] { | ||
def fromSpecific(it: TraversableOnce[A]): C = (cbf() ++= it).result() | ||
def newBuilder(): mutable.Builder[A, C] = cbf() | ||
} | ||
|
||
implicit def fromCanBuildFromConversion[X, A, C](x: X)(implicit toCanBuildFrom: X => CanBuildFrom[Nothing, A, C]): Factory[A, C] = | ||
fromCanBuildFrom(toCanBuildFrom(x)) | ||
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package collection | ||
|
||
import scala.collection.{Factory, Iterable, BitSet, mutable, immutable} | ||
import scala.collection.compat._ | ||
|
||
class FactoryTest { | ||
|
||
implicitly[Factory[Char, String]] | ||
implicitly[Factory[Char, Array[Char]]] | ||
implicitly[Factory[Int, BitSet]] | ||
implicitly[Factory[Int, mutable.BitSet]] | ||
implicitly[Factory[Int, immutable.BitSet]] | ||
|
||
BitSet: Factory[Int, BitSet] | ||
Iterable: Factory[Int, Iterable[Int]] | ||
immutable.TreeSet: Factory[Int, immutable.TreeSet[Int]] | ||
Map: Factory[(Int, String), Map[Int, String]] | ||
immutable.TreeMap: Factory[(Int, String), immutable.TreeMap[Int, String]] | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs special treatment of
Stream
andLazyList
to preserve laziness.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually this works because
Stream
uses aLazyBuilder
. I’ve added a test for that.