Rewrite io files to compile under Dotty

Author: felixmulder

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

@@ -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/AbstractFile.scala

@@ -114,7 +114,6 @@ abstract class AbstractFile extends Iterable[AbstractFile] {
 
   /** Does this abstract file denote an existing file? */
   def exists: Boolean = {
-    if (Statistics.canEnable) Statistics.incCounter(IOStats.fileExistsCount)
     (file eq null) || file.exists
   }
 

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

@@ -54,18 +54,8 @@ object Path {
 
   def apply(path: String): Path = apply(new JFile(path))
   def apply(jfile: JFile): Path = try {
-    def isFile = {
-      if (Statistics.canEnable) Statistics.incCounter(IOStats.fileIsFileCount)
-      jfile.isFile
-    }
-
-    def isDirectory = {
-      if (Statistics.canEnable) Statistics.incCounter(IOStats.fileIsDirectoryCount)
-      jfile.isDirectory
-    }
-
-    if (isFile) new File(jfile)
-    else if (isDirectory) new Directory(jfile)
+    if (jfile.isFile) new File(jfile)
+    else if (jfile.isDirectory) new Directory(jfile)
     else new Path(jfile)
   } catch { case ex: SecurityException => new Path(jfile) }
 
@@ -195,19 +185,11 @@ class Path private[io] (val jfile: JFile) {
   // Boolean tests
   def canRead = jfile.canRead()
   def canWrite = jfile.canWrite()
-  def exists = {
-    if (Statistics.canEnable) Statistics.incCounter(IOStats.fileExistsCount)
-    try jfile.exists() catch { case ex: SecurityException => false }
-  }
-
-  def isFile = {
-    if (Statistics.canEnable) Statistics.incCounter(IOStats.fileIsFileCount)
-    try jfile.isFile() catch { case ex: SecurityException => false }
-  }
-  def isDirectory = {
-    if (Statistics.canEnable) Statistics.incCounter(IOStats.fileIsDirectoryCount)
-    try jfile.isDirectory() catch { case ex: SecurityException => jfile.getPath == "." }
-  }
+  def exists = try jfile.exists() catch { case ex: SecurityException => false }
+  def isFile = try jfile.isFile() catch { case ex: SecurityException => false }
+  def isDirectory =
+    try jfile.isDirectory()
+    catch { case ex: SecurityException => jfile.getPath == "." }
   def isAbsolute = jfile.isAbsolute()
   def isEmpty = path.length == 0