2 files changed, 33 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/io/MsilFile.scala b/src/compiler/scala/tools/nsc/io/MsilFile.scala
index 69db23923d..d970d0e9c9 100644
--- a/src/compiler/scala/tools/nsc/io/MsilFile.scala
+++ b/src/compiler/scala/tools/nsc/io/MsilFile.scala
@@ -13,4 +13,6 @@ import ch.epfl.lamp.compiler.msil.{ Type => MsilType, _ }
  *  uniformly, as AbstractFiles.
  */
 class MsilFile(val msilType: MsilType) extends VirtualFile(msilType.FullName, msilType.Namespace) {
-}
-\ No newline at end of file
+}
+
+object NoMsilFile extends MsilFile(null) { }
diff --git a/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala b/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala
new file mode 100644
index 0000000000..36cf42d7ec
--- /dev/null
+++ b/src/compiler/scala/tools/nsc/io/NoAbstractFile.scala
@@ -0,0 +1,30 @@
+/* NSC -- new Scala compiler
+ * Copyright 2005-2011 LAMP/EPFL
+ * @author  Paul Phillips
+ */
+
+package scala.tools.nsc
+package io
+
+import java.io.InputStream
+
+/** A distinguished object so you can avoid both null
+ *  and Option.
+ */
+object NoAbstractFile extends AbstractFile {
+  def absolute: AbstractFile = this
+  def container: AbstractFile = this
+  def create(): Unit = ???
+  def delete(): Unit = ???
+  def file: JFile = null
+  def input: InputStream = null
+  def isDirectory: Boolean = false
+  def iterator: Iterator[AbstractFile] = Iterator.empty
+  def lastModified: Long = 0L
+  def lookupName(name: String, directory: Boolean): AbstractFile = null
+  def lookupNameUnchecked(name: String, directory: Boolean): AbstractFile = null
+  def name: String = ""
+  def output: java.io.OutputStream = null
+  def path: String = ""
+  override def toByteArray = Array[Byte]()
+}