diff options
| author | michelou <michelou@epfl.ch> | 2007-10-12 12:28:02 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-10-12 12:28:02 +0000 |
| commit | 34112093ef4cedba01c3d04eccf90573f1ddded2 (patch) | |
| tree | 13763de12716dbc4cbcdc303bfdedf52c22b6bc7 | |
| parent | 96eb13400af66fed71c78ec7061ef8b75b92e605 (diff) | |
| download | scala-34112093ef4cedba01c3d04eccf90573f1ddded2.tar.gz scala-34112093ef4cedba01c3d04eccf90573f1ddded2.tar.bz2 scala-34112093ef4cedba01c3d04eccf90573f1ddded2.zip | |
removed tabs
| -rw-r--r-- | src/compiler/scala/tools/nsc/InterpreterLoop.scala | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala index e1a2c80e98..50973bfb71 100644 --- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala +++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala @@ -125,7 +125,7 @@ class InterpreterLoop(in0: Option[BufferedReader], out: PrintWriter) { out.flush() val line = - if (first) { + if (first) { /* For some reason, the first interpreted command always takes * a second or two. So, wait until the welcome message * has been printed before calling bindSettings. That way, @@ -137,9 +137,9 @@ class InterpreterLoop(in0: Option[BufferedReader], out: PrintWriter) { bindSettings() first = false - futLine() + futLine() } else { - in.readLine(prompt) + in.readLine(prompt) } if (line eq null) @@ -265,35 +265,34 @@ class InterpreterLoop(in0: Option[BufferedReader], out: PrintWriter) { def loadFiles(settings: Settings) { settings match { case settings: GenericRunnerSettings => - for (filename <- settings.loadfiles.value) { - val cmd = ":load " + filename - command(cmd) - replayCommandsRev = cmd :: replayCommandsRev - out.println() - } + for (filename <- settings.loadfiles.value) { + val cmd = ":load " + filename + command(cmd) + replayCommandsRev = cmd :: replayCommandsRev + out.println() + } case _ => } } - def main(settings: Settings) { this.settings = settings in = in0 match { - case Some(in0) => - new SimpleReader(in0, out, true) - - case None => - val emacsShell = System.getProperty("env.emacs", "") != "" - //println("emacsShell="+emacsShell) //debug - if (settings.Xnojline.value || emacsShell) - new SimpleReader() - else - InteractiveReader.createDefault() + case Some(in0) => + new SimpleReader(in0, out, true) + + case None => + val emacsShell = System.getProperty("env.emacs", "") != "" + //println("emacsShell="+emacsShell) //debug + if (settings.Xnojline.value || emacsShell) + new SimpleReader() + else + InteractiveReader.createDefault() } - uglinessxxx = classOf[InterpreterLoop].getClassLoader + uglinessxxx = classOf[InterpreterLoop].getClassLoader createInterpreter() |