Rewrite io files to compile under Dotty

Author: felixmulder

compiler/src/dotty/tools/dotc/util/WeakHashSet.scala

@@ -37,7 +37,7 @@ final class WeakHashSet[A >: Null <: AnyRef](val initialCapacity: Int, val loadF
   /**
    * the number of elements in this set
    */
-  private[this] var count = 0
+  /*private[this]*/ var count = 0
 
   /**
    * from a specified initial capacity compute the capacity we'll use as being the next
@@ -86,7 +86,7 @@ final class WeakHashSet[A >: Null <: AnyRef](val initialCapacity: Int, val loadF
   /**
    * remove a single entry from a linked list in a given bucket
    */
-  private[this] def remove(bucket: Int, prevEntry: Entry[A], entry: Entry[A]) {
+  private[this] def remove(bucket: Int, prevEntry: Entry[A], entry: Entry[A]): Unit = {
     prevEntry match {
       case null => table(bucket) = entry.tail
       case _ => prevEntry.tail = entry.tail
@@ -97,7 +97,7 @@ final class WeakHashSet[A >: Null <: AnyRef](val initialCapacity: Int, val loadF
   /**
    * remove entries associated with elements that have been gc'ed
    */
-  private[this] def removeStaleEntries() {
+  private[this] def removeStaleEntries(): Unit = {
     def poll(): Entry[A] = queue.poll().asInstanceOf[Entry[A]]
 
     @tailrec
@@ -122,7 +122,7 @@ final class WeakHashSet[A >: Null <: AnyRef](val initialCapacity: Int, val loadF
   /**
    * Double the size of the internal table
    */
-  private[this] def resize() {
+  private[this] def resize(): Unit = {
     val oldTable = table
     table = new Array[Entry[A]](oldTable.size * 2)
     threshhold = computeThreshHold
@@ -207,7 +207,7 @@ final class WeakHashSet[A >: Null <: AnyRef](val initialCapacity: Int, val loadF
       val bucket = bucketFor(hash)
       val oldHead = table(bucket)
 
-      def add() {
+      def add() = {
         table(bucket) = new Entry(elem, hash, oldHead, queue)
         count += 1
         if (count > threshhold) resize()
@@ -228,7 +228,7 @@ final class WeakHashSet[A >: Null <: AnyRef](val initialCapacity: Int, val loadF
   def +=(elem: A) = this + elem
 
   // from scala.reflect.interanl.Set
-  override def addEntry(x: A) { this += x }
+  override def addEntry(x: A) = { this += x }
 
   // remove an element from this set and return this set
   override def -(elem: A): this.type = elem match {

compiler/src/dotty/tools/io/Statistics.scala

@@ -7,12 +7,12 @@ object Statistics {
   type TimerSnapshot = (Long, Long)
 
   /** If enabled, increment counter by one */
-  @inline final def incCounter(c: Counter) {
+  @inline final def incCounter(c: Counter) = {
     if (_enabled && c != null) c.value += 1
   }
 
   /** If enabled, increment counter by given delta */
-  @inline final def incCounter(c: Counter, delta: Int) {
+  @inline final def incCounter(c: Counter, delta: Int) = {
     if (_enabled && c != null) c.value += delta
   }
 
@@ -27,7 +27,7 @@ object Statistics {
     if (_enabled && sc != null) sc.start() else null
 
   /** If enabled, stop subcounter from tracking its base counter. */
-  @inline final def stopCounter(sc: SubCounter, start: (Int, Int)) {
+  @inline final def stopCounter(sc: SubCounter, start: (Int, Int)) = {
     if (_enabled && sc != null) sc.stop(start)
   }
 
@@ -36,7 +36,7 @@ object Statistics {
     if (_enabled && tm != null) tm.start() else null
 
   /** If enabled, stop timer */
-  @inline final def stopTimer(tm: Timer, start: TimerSnapshot) {
+  @inline final def stopTimer(tm: Timer, start: TimerSnapshot) = {
     if (_enabled && tm != null) tm.stop(start)
   }
 
@@ -45,7 +45,7 @@ object Statistics {
     if (_enabled && timers != null) timers.push(timer) else null
 
   /** If enabled, stop and pop timer from timer stack */
-  @inline final def popTimer(timers: TimerStack, prev: TimerSnapshot) {
+  @inline final def popTimer(timers: TimerStack, prev: TimerSnapshot) = {
     if (_enabled && timers != null) timers.pop(prev)
   }
 
@@ -156,7 +156,7 @@ quant)
 
   class SubCounter(prefix: String, override val underlying: Counter) extends Counter(prefix, underlying.phases) with SubQuantity {
     def start() = (value, underlying.value)
-    def stop(prev: (Int, Int)) {
+    def stop(prev: (Int, Int)) = {
       val (value0, uvalue0) = prev
       value = value0 + underlying.value - uvalue0
     }
@@ -170,7 +170,7 @@ quant)
     def start() = {
       (nanos, System.nanoTime())
     }
-    def stop(prev: TimerSnapshot) {
+    def stop(prev: TimerSnapshot) = {
       val (nanos0, start) = prev
       nanos = nanos0 + System.nanoTime() - start
       timings += 1
@@ -209,7 +209,7 @@ quant)
       elem
     }
     override def toString =
-      this.toSeq.sortWith(_._2 > _._2).map {
+      this.toSeq.map {
         case (cls: Class[_], elem) =>
           s"${cls.toString.substring(cls.toString.lastIndexOf("$") + 1)}: $elem"
         case (key, elem) =>

compiler/src/dotty/tools/io/Streamable.scala

@@ -54,7 +54,7 @@ object Streamable {
       lazy val in = bufferedInput()
       var offset = 0
 
-      def loop() {
+      def loop(): Unit = {
         if (offset < len) {
           val read = in.read(arr, offset, len - offset)
           if (read >= 0) {

compiler/src/dotty/tools/io/VirtualDirectory.scala

@@ -33,10 +33,10 @@ extends AbstractFile {
   override def output = sys.error("directories cannot be written")
 
   /** Does this abstract file denote an existing file? */
-  def create() { unsupported() }
+  def create() = { unsupported() }
 
   /** Delete the underlying file or directory (recursively). */
-  def delete() { unsupported() }
+  def delete() = { unsupported() }
 
   /** Returns an abstract file with the given name. It does not
    *  check that it exists.
@@ -66,7 +66,7 @@ extends AbstractFile {
       dir
     }
 
-  def clear() {
+  def clear() = {
     files.clear()
   }
 }

compiler/src/dotty/tools/io/VirtualFile.scala

@@ -43,7 +43,7 @@ class VirtualFile(val name: String, override val path: String) extends AbstractF
 
   override def output: OutputStream = {
     new ByteArrayOutputStream() {
-      override def close() {
+      override def close() = {
         super.close()
         content = toByteArray()
       }

compiler/src/dotty/tools/io/ZipArchive.scala

@@ -153,11 +153,11 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {
     val root = new DirEntry("/")
     val dirs = mutable.HashMap[String, DirEntry]("/" -> root)
     val zipFile = openZipFile()
-    val enum    = zipFile.entries()
+    val entries = zipFile.entries()
 
     try {
-      while (enum.hasMoreElements) {
-        val zipEntry = enum.nextElement
+      while (entries.hasMoreElements) {
+        val zipEntry = entries.nextElement
         val dir = getDir(dirs, zipEntry)
         if (zipEntry.isDirectory) dir
         else {
@@ -195,74 +195,6 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {
     case _                 => false
   }
 }
-///** ''Note:  This library is considered experimental and should not be used unless you know what you are doing.'' */
-//final class URLZipArchive(val url: URL) extends ZipArchive(null) {
-//  def iterator: Iterator[Entry] = {
-//    val root     = new DirEntry("/")
-//    val dirs     = mutable.HashMap[String, DirEntry]("/" -> root)
-//    val in       = new ZipInputStream(new ByteArrayInputStream(Streamable.bytes(input)))
-//
-//    @tailrec def loop() {
-//      val zipEntry = in.getNextEntry()
-//      class EmptyFileEntry() extends Entry(zipEntry.getName) {
-//        override def toByteArray: Array[Byte] = null
-//        override def sizeOption = Some(0)
-//      }
-//      class FileEntry() extends Entry(zipEntry.getName) {
-//        override val toByteArray: Array[Byte] = {
-//          val len    = zipEntry.getSize().toInt
-//          val arr    = if (len == 0) Array.emptyByteArray else new Array[Byte](len)
-//          var offset = 0
-//
-//          def loop() {
-//            if (offset < len) {
-//              val read = in.read(arr, offset, len - offset)
-//              if (read >= 0) {
-//                offset += read
-//                loop()
-//              }
-//            }
-//          }
-//          loop()
-//
-//          if (offset == arr.length) arr
-//          else throw new IOException("Input stream truncated: read %d of %d bytes".format(offset, len))
-//        }
-//        override def sizeOption = Some(zipEntry.getSize().toInt)
-//      }
-//
-//      if (zipEntry != null) {
-//        val dir = getDir(dirs, zipEntry)
-//        if (zipEntry.isDirectory)
-//          dir
-//        else {
-//          val f = if (zipEntry.getSize() == 0) new EmptyFileEntry() else new FileEntry()
-//          dir.entries(f.name) = f
-//        }
-//        in.closeEntry()
-//        loop()
-//      }
-//    }
-//
-//    loop()
-//    try root.iterator
-//    finally dirs.clear()
-//  }
-//
-//  def name  = url.getFile()
-//  def path  = url.getPath()
-//  def input = url.openStream()
-//  def lastModified =
-//    try url.openConnection().getLastModified()
-//    catch { case _: IOException => 0 }
-//
-//  override def canEqual(other: Any) = other.isInstanceOf[URLZipArchive]
-//  override def hashCode() = url.hashCode
-//  override def equals(that: Any) = that match {
-//    case x: URLZipArchive => url == x.url
-//    case _                => false
-//  }
-//}
 
 final class ManifestResources(val url: URL) extends ZipArchive(null) {
   def iterator = {
@@ -274,12 +206,11 @@ final class ManifestResources(val url: URL) extends ZipArchive(null) {
     for (zipEntry <- iter) {
       val dir = getDir(dirs, zipEntry)
       if (!zipEntry.isDirectory) {
-        class FileEntry() extends Entry(zipEntry.getName) {
+        val f = new Entry(zipEntry.getName) {
           override def lastModified = zipEntry.getTime()
           override def input        = resourceInputStream(path)
           override def sizeOption   = None
         }
-        val f = new FileEntry()
         dir.entries(f.name) = f
       }
     }