diff options
author | Martin Odersky <odersky@gmail.com> | 2011-10-24 09:27:02 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2011-10-24 09:27:02 +0000 |
commit | 1df8d23b472b431f66dddbbeafa729ad425cda7d (patch) | |
tree | d5f04ea0e494f9a33ee4b9b1b6164dcbe7de6f4d | |
parent | dbcc393e572c9c8e3ee37ff59a8465c840e94977 (diff) | |
download | scala-1df8d23b472b431f66dddbbeafa729ad425cda7d.tar.gz scala-1df8d23b472b431f66dddbbeafa729ad425cda7d.tar.bz2 scala-1df8d23b472b431f66dddbbeafa729ad425cda7d.zip |
Pushed NPE defense in NoSourceFile.file out ano...
Pushed NPE defense in NoSourceFile.file out another level.
-rw-r--r-- | src/compiler/scala/tools/nsc/util/SourceFile.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala index 42489c5aaf..22820806be 100644 --- a/src/compiler/scala/tools/nsc/util/SourceFile.scala +++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala @@ -55,7 +55,7 @@ abstract class SourceFile { */ object NoSourceFile extends SourceFile { def content = Array() - def file = null // TODO: push NPE-defense out another level or two + def file = NoFile def isLineBreak(idx: Int) = false def isSelfContained = true def length = -1 @@ -64,6 +64,8 @@ object NoSourceFile extends SourceFile { override def toString = "NoSourceFile" } +object NoFile extends VirtualFile("<no file>", "<no file>") + object ScriptSourceFile { /** Length of the script header from the given content, if there is one. * The header begins with "#!" or "::#!" and ends with a line starting |