Fix for #2563. Review by mharrah.

1 files changed, 9 insertions, 10 deletions

diff --git a/src/compiler/scala/tools/nsc/EvalLoop.scala b/src/compiler/scala/tools/nsc/EvalLoop.scala
index 46579801bc..388bcf8ccc 100644
--- a/src/compiler/scala/tools/nsc/EvalLoop.scala
+++ b/src/compiler/scala/tools/nsc/EvalLoop.scala
@@ -6,22 +6,21 @@
 
 package scala.tools.nsc
 
-trait EvalLoop {
+import annotation.tailrec
+import java.io.EOFException
 
+trait EvalLoop {
   def prompt: String
 
   def loop(action: (String) => Unit) {
-    Console.print(prompt)
-    try {
-      val line = Console.readLine
-      if (line.length() > 0) {
+    @tailrec def inner() {
+      Console.print(prompt)
+      val line = try Console.readLine catch { case _: EOFException => null }
+      if (line != null && line != "") {
         action(line)
-        loop(action)
+        inner()
       }
     }
-    catch {
-      case _: java.io.EOFException => //nop
-    }
+    inner()
   }
-
 }