Changed Super to fix #4300

12 files changed, 37 insertions, 35 deletions

diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index 5cb987d750..5493dabca6 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -560,10 +560,10 @@ object JavaConversions {
 
   case class IteratorWrapper[A](underlying : Iterator[A]) extends ju.Iterator[A] with ju.Enumeration[A] {
     def hasNext = underlying.hasNext
-    def next = underlying.next
+    def next() = underlying.next
     def hasMoreElements = underlying.hasNext
-    def nextElement = underlying.next
-    def remove = throw new UnsupportedOperationException
+    def nextElement() = underlying.next
+    def remove() = throw new UnsupportedOperationException
   }
 
   class ToIteratorWrapper[A](underlying : Iterator[A]) {
@@ -572,12 +572,12 @@ object JavaConversions {
 
   case class JIteratorWrapper[A](underlying : ju.Iterator[A]) extends Iterator[A] {
     def hasNext = underlying.hasNext
-    def next = underlying.next
+    def next() = underlying.next
   }
 
   case class JEnumerationWrapper[A](underlying : ju.Enumeration[A]) extends Iterator[A] {
     def hasNext = underlying.hasMoreElements
-    def next = underlying.nextElement
+    def next() = underlying.nextElement
   }
 
   case class IterableWrapper[A](underlying : Iterable[A])
@@ -696,7 +696,7 @@ object JavaConversions {
 
         def hasNext = ui.hasNext
 
-        def next = {
+        def next() = {
           val (k, v) = ui.next
           prev = Some(k)
           new ju.Map.Entry[A, B] {
@@ -711,7 +711,7 @@ object JavaConversions {
           }
         }
 
-        def remove = prev match {
+        def remove() = prev match {
           case Some(k) =>
             underlying match {
               case mm: mutable.Map[a, _] =>
@@ -781,7 +781,7 @@ object JavaConversions {
     def iterator = new Iterator[(A, B)] {
       val ui = underlying.entrySet.iterator
       def hasNext = ui.hasNext
-      def next = { val e = ui.next ; (e.getKey, e.getValue) }
+      def next() = { val e = ui.next ; (e.getKey, e.getValue) }
     }
 
     override def clear() = underlying.clear()
@@ -930,7 +930,7 @@ object JavaConversions {
     def iterator = new Iterator[(String, String)] {
       val ui = underlying.entrySet.iterator
       def hasNext = ui.hasNext
-      def next = { val e = ui.next ; (e.getKey.asInstanceOf[String], e.getValue.asInstanceOf[String]) }
+      def next() = { val e = ui.next ; (e.getKey.asInstanceOf[String], e.getValue.asInstanceOf[String]) }
     }
 
     override def clear() = underlying.clear()
diff --git a/src/library/scala/collection/MapLike.scala b/src/library/scala/collection/MapLike.scala
index 0d012d01b7..6fb971d128 100644
--- a/src/library/scala/collection/MapLike.scala
+++ b/src/library/scala/collection/MapLike.scala
@@ -174,7 +174,7 @@ self =>
   def keysIterator: Iterator[A] = new Iterator[A] {
     val iter = self.iterator
     def hasNext = iter.hasNext
-    def next = iter.next._1
+    def next() = iter.next._1
   }
 
   /** Creates an iterator for all keys.
@@ -205,7 +205,7 @@ self =>
   def valuesIterator: Iterator[B] = new Iterator[B] {
     val iter = self.iterator
     def hasNext = iter.hasNext
-    def next = iter.next._2
+    def next() = iter.next._2
   }
 
   /** Defines the default value computation for the map,
diff --git a/src/library/scala/collection/generic/Signalling.scala b/src/library/scala/collection/generic/Signalling.scala
index eaf945a4b7..e29e4fcdc9 100644
--- a/src/library/scala/collection/generic/Signalling.scala
+++ b/src/library/scala/collection/generic/Signalling.scala
@@ -44,7 +44,7 @@ trait Signalling {
    *
    * $abortflag
    */
-  def abort: Unit
+  def abort(): Unit
 
   /**
    * Returns the value of the index flag.
@@ -113,7 +113,7 @@ object IdleSignalling extends DefaultSignalling
 trait VolatileAbort extends Signalling {
   @volatile private var abortflag = false
   override def isAborted = abortflag
-  override def abort = abortflag = true
+  override def abort() = abortflag = true
 }
 
 
@@ -155,7 +155,7 @@ trait DelegatedSignalling extends Signalling {
   var signalDelegate: Signalling
 
   def isAborted = signalDelegate.isAborted
-  def abort = signalDelegate.abort
+  def abort() = signalDelegate.abort
 
   def indexFlag = signalDelegate.indexFlag
   def setIndexFlag(f: Int) = signalDelegate.setIndexFlag(f)
diff --git a/src/library/scala/collection/immutable/LongMap.scala b/src/library/scala/collection/immutable/LongMap.scala
index d3ea9efffd..30a15abfa9 100644
--- a/src/library/scala/collection/immutable/LongMap.scala
+++ b/src/library/scala/collection/immutable/LongMap.scala
@@ -84,7 +84,7 @@ private[immutable] abstract class LongMapIterator[V, T](it : LongMap[V]) extends
   var index = 0;
   var buffer = new Array[AnyRef](65);
 
-  def pop = {
+  def pop() = {
     index -= 1;
     buffer(index).asInstanceOf[LongMap[V]];
   }
@@ -102,7 +102,7 @@ private[immutable] abstract class LongMapIterator[V, T](it : LongMap[V]) extends
 
   def hasNext = index != 0;
   final def next : T =
-    pop match {
+    pop() match {
       case LongMap.Bin(_,_, t@LongMap.Tip(_, _), right) => {
         push(right);
         valueOf(t);
diff --git a/src/library/scala/collection/mutable/ArrayStack.scala b/src/library/scala/collection/mutable/ArrayStack.scala
index 1851345aed..3172d296dc 100644
--- a/src/library/scala/collection/mutable/ArrayStack.scala
+++ b/src/library/scala/collection/mutable/ArrayStack.scala
@@ -113,7 +113,7 @@ extends Seq[T]
    *
    *  @return the element on top of the stack
    */
-  def pop: T = {
+  def pop(): T = {
     if (index == 0) sys.error("Stack empty")
     index -= 1
     val x = table(index).asInstanceOf[T]
@@ -140,7 +140,7 @@ extends Seq[T]
    *  the top equal to the element that was previously at the top.
    *  If the stack is empty, an exception is thrown.
    */
-  def dup = push(top)
+  def dup() = push(top)
 
   /** Empties the stack. */
   def clear {
@@ -215,7 +215,7 @@ extends Seq[T]
   def iterator: Iterator[T] = new Iterator[T] {
     var currentIndex = index
     def hasNext = currentIndex > 0
-    def next = {
+    def next() = {
       currentIndex -= 1
       table(currentIndex).asInstanceOf[T]
     }
@@ -229,5 +229,5 @@ extends Seq[T]
     }
   }
 
-  override def clone = new ArrayStack[T](ArrayStack.clone(table), index)
+  override def clone() = new ArrayStack[T](ArrayStack.clone(table), index)
 }
diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala
index 342d6d9268..48386c8034 100644
--- a/src/library/scala/collection/mutable/FlatHashTable.scala
+++ b/src/library/scala/collection/mutable/FlatHashTable.scala
@@ -270,7 +270,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
     println(sizemap.toList)
   }
 
-  protected def sizeMapDisable = sizemap = null
+  protected def sizeMapDisable() = sizemap = null
 
   protected def isSizeMapDefined = sizemap ne null
 
diff --git a/src/library/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala
index c1b4e50021..890a6cbf24 100644
--- a/src/library/scala/collection/mutable/HashMap.scala
+++ b/src/library/scala/collection/mutable/HashMap.scala
@@ -106,14 +106,14 @@ extends Map[A, B]
   override def keysIterator: Iterator[A] = new Iterator[A] {
     val iter = entriesIterator
     def hasNext = iter.hasNext
-    def next = iter.next.key
+    def next() = iter.next.key
   }
 
   /* Override to avoid tuple allocation */
   override def valuesIterator: Iterator[B] = new Iterator[B] {
     val iter = entriesIterator
     def hasNext = iter.hasNext
-    def next = iter.next.value
+    def next() = iter.next.value
   }
 
   /** Toggles whether a size map is used to track hash map statistics.
diff --git a/src/library/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala
index 420670d755..b8409ab3bd 100644
--- a/src/library/scala/collection/mutable/HashTable.scala
+++ b/src/library/scala/collection/mutable/HashTable.scala
@@ -160,7 +160,7 @@ trait HashTable[A, Entry >: Null <: HashEntry[A, Entry]] extends HashTable.HashU
     var es = iterTable(idx).asInstanceOf[Entry]
     scan()
     def hasNext = es != null
-    def next = {
+    def next() = {
       val res = es
       es = es.next
       scan()
@@ -295,7 +295,7 @@ trait HashTable[A, Entry >: Null <: HashEntry[A, Entry]] extends HashTable.HashU
     println(sizemap.toList)
   }
 
-  protected def sizeMapDisable = sizemap = null
+  protected def sizeMapDisable() = sizemap = null
 
   protected def isSizeMapDefined = sizemap ne null
 
diff --git a/src/library/scala/collection/parallel/Tasks.scala b/src/library/scala/collection/parallel/Tasks.scala
index 6f00547925..921223217d 100644
--- a/src/library/scala/collection/parallel/Tasks.scala
+++ b/src/library/scala/collection/parallel/Tasks.scala
@@ -164,7 +164,7 @@ trait AdaptiveWorkStealingTasks extends Tasks {
     def compute = if (body.shouldSplitFurther) internal else body.tryLeaf(None)
 
     def internal = {
-      var last = spawnSubtasks
+      var last = spawnSubtasks()
 
       last.body.tryLeaf(None)
       body.result = last.body.result
@@ -187,7 +187,7 @@ trait AdaptiveWorkStealingTasks extends Tasks {
       }
     }
 
-    def spawnSubtasks = {
+    def spawnSubtasks() = {
       var last: TaskImpl[R, Tp] = null
       var head: TaskImpl[R, Tp] = this
       do {
@@ -203,7 +203,7 @@ trait AdaptiveWorkStealingTasks extends Tasks {
       head
     }
 
-    def printChain = {
+    def printChain() = {
       var curr = this
       var chain = "chain: "
       while (curr != null) {
diff --git a/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala b/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
index 8929c978b6..3bb3d4d763 100644
--- a/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
+++ b/src/library/scala/collection/parallel/mutable/ParFlatHashTable.scala
@@ -43,7 +43,7 @@ trait ParFlatHashTable[T] extends collection.mutable.FlatHashTable[T] {
       }
     }
 
-    private def checkbounds = if (idx >= itertable.length) {
+    private def checkbounds() = if (idx >= itertable.length) {
       throw new IndexOutOfBoundsException(idx.toString)
     }
 
@@ -51,7 +51,7 @@ trait ParFlatHashTable[T] extends collection.mutable.FlatHashTable[T] {
 
     def remaining = totalsize - traversed
     def hasNext = traversed < totalsize
-    def next = if (hasNext) {
+    def next() = if (hasNext) {
       val r = itertable(idx).asInstanceOf[T]
       traversed += 1
       idx += 1
@@ -108,7 +108,7 @@ trait ParFlatHashTable[T] extends collection.mutable.FlatHashTable[T] {
       count
     }
 
-    private def check = if (table.slice(idx, until).count(_ != null) != remaining) {
+    private def check() = if (table.slice(idx, until).count(_ != null) != remaining) {
       println("Invariant broken: " + debugInformation)
       assert(false)
     }
diff --git a/src/library/scala/reflect/generic/Trees.scala b/src/library/scala/reflect/generic/Trees.scala
index a84dd98210..baf36c9749 100755
--- a/src/library/scala/reflect/generic/Trees.scala
+++ b/src/library/scala/reflect/generic/Trees.scala
@@ -409,11 +409,13 @@ trait Trees { self: Universe =>
        extends TermTree with SymTree
     // The symbol of an ApplyDynamic is the function symbol of `qual', or NoSymbol, if there is none.
 
-  /** Super reference */
-  case class Super(qual: TypeName, mix: TypeName)
-       extends TermTree with SymTree
+  /** Super reference, qual = corresponding this reference */
+  case class Super(qual: Tree, mix: TypeName) extends TermTree {
     // The symbol of a Super is the class _from_ which the super reference is made.
     // For instance in C.super(...), it would be C.
+    override def symbol: Symbol = qual.symbol
+    override def symbol_=(sym: Symbol) { qual.symbol = sym }
+  }
 
   /** Self reference */
   case class This(qual: TypeName)
diff --git a/src/library/scala/reflect/generic/UnPickler.scala b/src/library/scala/reflect/generic/UnPickler.scala
index 5ad1b75e71..6fca886e64 100755
--- a/src/library/scala/reflect/generic/UnPickler.scala
+++ b/src/library/scala/reflect/generic/UnPickler.scala
@@ -674,7 +674,7 @@ abstract class UnPickler {
 
         case SUPERtree =>
           setSym()
-          val qual = readTypeNameRef()
+          val qual = readTreeRef()
           val mix = readTypeNameRef()
           Super(qual, mix)