From e6cc26c10f00972bad564d268b0543b263aebb0c Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 7 Apr 2011 22:50:26 -0400 Subject: [PATCH] move toSeq up from IMap to PMap --- util/collection/PMap.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/collection/PMap.scala b/util/collection/PMap.scala index bc054ae87..32274c67a 100644 --- a/util/collection/PMap.scala +++ b/util/collection/PMap.scala @@ -11,6 +11,7 @@ trait RMap[K[_], V[_]] def apply[T](k: K[T]): V[T] def get[T](k: K[T]): Option[V[T]] def contains[T](k: K[T]): Boolean + def toSeq: Seq[(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 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 toSeq: Seq[(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) v } + def toSeq = backing.toSeq 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]