diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-21 13:24:41 +0000 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-10-21 13:24:41 +0000 |
commit | f818b44b1c7a4ad62271600d85dc41602a7349f7 (patch) | |
tree | ffd58eb03cb644872ffdbedf4725b147588b2742 /src/library/scala/Enumeration.scala | |
parent | 70bc8f93c56d6ac2390bbae8a0ab173926240549 (diff) | |
download | scala-f818b44b1c7a4ad62271600d85dc41602a7349f7.tar.gz scala-f818b44b1c7a4ad62271600d85dc41602a7349f7.tar.bz2 scala-f818b44b1c7a4ad62271600d85dc41602a7349f7.zip |
renamed BuilderFactory[El, To, From] -> CanBuil...
renamed BuilderFactory[El, To, From] -> CanBuildFrom[From, El, To] and
added apply() overload to create collections from scratch generically
added def apply() overload to BuilderFactory so that we can also create collections from scratch generically
(see test test/files/pos/collectGenericCC.scala)
renaming:
- BuilderFactory[El, To, From] -> CanBuildFrom[From, El, To]
bulk type-param reordering using: s/CanBuildFrom\[\s*([^,()\s]*)\s*,(\s+[^\s,()]*)\s*,\s+([^\s,()]*)\s*\]/CanBuildFrom[$3, $1,$2]/
some argument lists got mixed up because they contained 4 comma's...
- builderFactory -> canBuildFrom
removed explicit implicit value in DocDriver that was
renamed renamed collection/generic/BuilderFactory.scala ->
collection/generic/CanBuildFrom.scala
tested with clean build using ant strap.done -- everything went well on my machine
Diffstat (limited to 'src/library/scala/Enumeration.scala')
-rw-r--r-- | src/library/scala/Enumeration.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index f319afdf2e..7fa9180a36 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -14,7 +14,7 @@ package scala import scala.collection.SetLike import scala.collection.mutable.{Builder, AddingBuilder, Map, HashMap} import scala.collection.immutable.{Set, BitSet} -import scala.collection.generic.BuilderFactory +import scala.collection.generic.CanBuildFrom /** <p> * Defines a finite set of values specific to the enumeration. Typically @@ -233,7 +233,11 @@ abstract class Enumeration(initial: Int, names: String*) { /** A builder object for value sets */ def newBuilder: Builder[Value, ValueSet] = new AddingBuilder(empty) /** The implicit builder for value sets */ - implicit def builderFactory: BuilderFactory[Value, ValueSet, ValueSet] = new BuilderFactory[Value, ValueSet, ValueSet] { def apply(from: ValueSet) = newBuilder } + implicit def canBuildFrom: CanBuildFrom[ValueSet, Value, ValueSet] = + new CanBuildFrom[ValueSet, Value, ValueSet] { + def apply(from: ValueSet) = newBuilder + def apply() = newBuilder + } } /** The name of this enumeration. */ |