From fedf080a59760216f788c7fd649ffdecc1d33ae5 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Tue, 4 Sep 2012 19:05:35 +0400
Subject: [PATCH] changes in MutableMap trait

---
 compiler/frontend/src/jet/Collections.jet |  4 +---
 compiler/testData/builtin-classes.txt     | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/compiler/frontend/src/jet/Collections.jet b/compiler/frontend/src/jet/Collections.jet
index 0da8ea15783..866cd5e533f 100644
--- a/compiler/frontend/src/jet/Collections.jet
+++ b/compiler/frontend/src/jet/Collections.jet
@@ -130,9 +130,7 @@ public trait MutableMap<K, V> : Map<K, V> {
     public fun clear()
 
     // Views
-    override fun keySet() : MutableSet<K>
-    override fun values() : MutableCollection<V>
-    override fun entrySet() : MutableSet<MutableMap.MutableEntry<K, V>>
+    override fun entrySet() : Set<MutableMap.MutableEntry<K, V>>
 
     public trait MutableEntry<K,V> : Map.Entry<K, V>, Hashable {
 	public fun setValue(value : V) : V
diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index 0d69b3edc4d..fdbee57a4d5 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -752,12 +752,12 @@ public abstract trait jet.List</*0*/ out E : jet.Any?> : jet.Collection<E> {
     public abstract override /*1*/ fun toArray(): jet.Array<jet.Any?>
     public abstract override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
 }
-public abstract trait jet.ListIterator</*0*/ E : jet.Any?> : jet.Iterator<E> {
+public abstract trait jet.ListIterator</*0*/ T : jet.Any?> : jet.Iterator<T> {
     public abstract override /*1*/ fun hasNext(): jet.Boolean
     public abstract fun hasPrevious(): jet.Boolean
-    public abstract override /*1*/ fun next(): E
+    public abstract override /*1*/ fun next(): T
     public abstract fun nextIndex(): jet.Int
-    public abstract fun previous(): E
+    public abstract fun previous(): T
     public abstract fun previousIndex(): jet.Int
 }
 public final class jet.Long : jet.Number, jet.Comparable<jet.Long> {
@@ -932,22 +932,22 @@ public abstract trait jet.MutableList</*0*/ E : jet.Any?> : jet.List<E>, jet.Mut
     public abstract override /*2*/ fun toArray(): jet.Array<jet.Any?>
     public abstract override /*2*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ a: jet.Array<out T>): jet.Array<T>
 }
-public abstract trait jet.MutableListIterator</*0*/ E : jet.Any?> : jet.ListIterator<E>, jet.MutableIterator<E> {
-    public abstract fun add(/*0*/ e: E): jet.Tuple0
+public abstract trait jet.MutableListIterator</*0*/ T : jet.Any?> : jet.ListIterator<T>, jet.MutableIterator<T> {
+    public abstract fun add(/*0*/ e: T): jet.Tuple0
     public abstract override /*2*/ fun hasNext(): jet.Boolean
     public abstract override /*1*/ fun hasPrevious(): jet.Boolean
-    public abstract override /*2*/ fun next(): E
+    public abstract override /*2*/ fun next(): T
     public abstract override /*1*/ fun nextIndex(): jet.Int
-    public abstract override /*1*/ fun previous(): E
+    public abstract override /*1*/ fun previous(): T
     public abstract override /*1*/ fun previousIndex(): jet.Int
     public abstract override /*1*/ fun remove(): jet.Tuple0
-    public abstract fun set(/*0*/ e: E): jet.Tuple0
+    public abstract fun set(/*0*/ e: T): jet.Tuple0
 }
 public abstract trait jet.MutableMap</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : jet.Map<K, V> {
     public abstract fun clear(): jet.Tuple0
     public abstract override /*1*/ fun containsKey(/*0*/ key: jet.Any?): jet.Boolean
     public abstract override /*1*/ fun containsValue(/*0*/ value: jet.Any?): jet.Boolean
-    public abstract override /*1*/ fun entrySet(): jet.MutableSet<jet.MutableMap.MutableEntry<K, V>>
+    public abstract override /*1*/ fun entrySet(): jet.Set<jet.MutableMap.MutableEntry<K, V>>
     public abstract override /*1*/ fun get(/*0*/ key: jet.Any?): V?
     public abstract override /*1*/ fun isEmpty(): jet.Boolean
     public abstract trait jet.MutableMap.MutableEntry</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : jet.Map.Entry<K, V>, jet.Hashable {
@@ -957,12 +957,12 @@ public abstract trait jet.MutableMap</*0*/ K : jet.Any?, /*1*/ V : jet.Any?> : j
         public abstract override /*2*/ fun hashCode(): jet.Int
         public abstract fun setValue(/*0*/ value: V): V
     }
-    public abstract override /*1*/ fun keySet(): jet.MutableSet<K>
+    public abstract override /*1*/ fun keySet(): jet.Set<K>
     public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
     public abstract fun putAll(/*0*/ m: jet.Map<out K, out V>): jet.Tuple0
     public abstract fun remove(/*0*/ key: jet.Any?): V?
     public abstract override /*1*/ fun size(): jet.Int
-    public abstract override /*1*/ fun values(): jet.MutableCollection<V>
+    public abstract override /*1*/ fun values(): jet.Collection<V>
 }
 public abstract trait jet.MutableSet</*0*/ E : jet.Any?> : jet.Set<E>, jet.MutableCollection<E> {
     public abstract override /*1*/ fun add(/*0*/ e: E): jet.Boolean