luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move toSeq up from IMap to PMap

This commit is contained in:
Mark Harrah 2011-04-07 22:50:26 -04:00
parent 2a737690a8
commit e6cc26c10f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/collection/PMap.scala
View File

@ -11,6 +11,7 @@ trait RMap[K[_], V[_]]
def apply[T](k: K[T]): V[T] def apply[T](k: K[T]): V[T]
def get[T](k: K[T]): Option[V[T]] def get[T](k: K[T]): Option[V[T]]
def contains[T](k: K[T]): Boolean def contains[T](k: K[T]): Boolean
def toSeq: Seq[(K[_], V[_])]
} }
trait IMap[K[_], V[_]] extends (K ~> V) with RMap[K,V] trait IMap[K[_], V[_]] extends (K ~> V) with RMap[K,V]
@ -19,7 +20,6 @@ trait IMap[K[_], V[_]] extends (K ~> V) with RMap[K,V]
def remove[T](k: K[T]): IMap[K,V] def remove[T](k: K[T]): IMap[K,V]
def mapValue[T](k: K[T], init: V[T], f: V[T] => V[T]): IMap[K,V] def mapValue[T](k: K[T], init: V[T], f: V[T] => V[T]): IMap[K,V]
def mapValues[V2[_]](f: V ~> V2): IMap[K,V2] def mapValues[V2[_]](f: V ~> V2): IMap[K,V2]
def toSeq: Seq[(K[_], V[_])]
} }
trait PMap[K[_], V[_]] extends (K ~> V) with RMap[K,V] trait PMap[K[_], V[_]] extends (K ~> V) with RMap[K,V]
{ {
@ -82,6 +82,7 @@ class DelegatingPMap[K[_], V[_]](backing: mutable.Map[K[_], V[_]]) extends Abstr
update(k, v) update(k, v)
v v
} }
def toSeq = backing.toSeq
private[this] def cast[T](v: V[_]): V[T] = v.asInstanceOf[V[T]] private[this] def cast[T](v: V[_]): V[T] = v.asInstanceOf[V[T]]
private[this] def cast[T](o: Option[V[_]]): Option[V[T]] = o map cast[T] private[this] def cast[T](o: Option[V[_]]): Option[V[T]] = o map cast[T]