summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-07-12 08:57:34 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-07-12 08:57:34 +0000
commit574e9dd010e15d0ffa1f827af63e1984cfca771a (patch)
tree336fd1eadb2c8c5fc5722df84c395d3877c9d68f /src
parent76fd52f3062a0a1d65766025d4d01a60b3ec480d (diff)
downloadscala-574e9dd010e15d0ffa1f827af63e1984cfca771a.tar.gz
scala-574e9dd010e15d0ffa1f827af63e1984cfca771a.tar.bz2
scala-574e9dd010e15d0ffa1f827af63e1984cfca771a.zip
Reverted r15497 and r15500.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/InterpreterLoop.scala8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
index c0fcee0bc8..3f5e4d5c41 100644
--- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala
+++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
@@ -198,13 +198,11 @@ class InterpreterLoop(in0: Option[BufferedReader], out: PrintWriter) {
return ()
}
val filename = command.substring(spaceIdx).trim
- if (new File(filename).exists)
- action(filename)
- else if (new File(filename + ".scala").exists)
- action(filename + ".scala")
- else {
+ if (! new File(filename).exists) {
out.println("That file does not exist")
+ return ()
}
+ action(filename)
}
val helpRegexp = ":h(e(l(p)?)?)?"