diff options
author | michelou <michelou@epfl.ch> | 2006-07-20 15:24:23 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-07-20 15:24:23 +0000 |
commit | 4146327bbd6b8e5468c05a570a9190c99c4285e3 (patch) | |
tree | 21bddbe652ad6de36ba9344cbdef55141503d294 /src/compiler/scala/tools/nsc/CompileServer.scala | |
parent | ab9c3ee71d1c5ef758d47fd2d39c79e1dc68ca40 (diff) | |
download | scala-4146327bbd6b8e5468c05a570a9190c99c4285e3.tar.gz scala-4146327bbd6b8e5468c05a570a9190c99c4285e3.tar.bz2 scala-4146327bbd6b8e5468c05a570a9190c99c4285e3.zip |
fsc prints more info messages with -verbose option
Diffstat (limited to 'src/compiler/scala/tools/nsc/CompileServer.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/CompileServer.scala | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala index 905ca938c3..c88f412948 100644 --- a/src/compiler/scala/tools/nsc/CompileServer.scala +++ b/src/compiler/scala/tools/nsc/CompileServer.scala @@ -3,6 +3,7 @@ * @author Martin Odersky */ // $Id$ + package scala.tools.nsc import scala.tools.util.SocketServer @@ -14,6 +15,9 @@ import java.io._ /** The main class for NSC, a compiler for the programming * language Scala. + * + * @author Martin Odersky + * @version 1.0 */ object CompileServer extends SocketServer { @@ -54,10 +58,8 @@ object CompileServer extends SocketServer { progress = false spawn { Thread.sleep(10000) - if (!progress) { - System.err.println("port file no longer exists; exiting") - exit(1) - } + if (!progress) + fatal("port file no longer exists; exiting") } } } @@ -66,9 +68,10 @@ object CompileServer extends SocketServer { private val runtime = Runtime.getRuntime() def session(): unit = { - System.out.println("New session, total memory = "+runtime.totalMemory()+ - ", max memory = "+runtime.maxMemory()+ - ", free memory = "+runtime.freeMemory) + System.out.println("New session" + + ", total memory = "+ runtime.totalMemory() + + ", max memory = " + runtime.maxMemory() + + ", free memory = " + runtime.freeMemory) val password = CompileSocket.getPassword(port) val guessedPassword = in.readLine() val input = in.readLine() @@ -105,7 +108,7 @@ object CompileServer extends SocketServer { new settings.BooleanSetting("-J<flag>", "Pass <flag> directly to runtime system") } - reporter.prompt = command.settings.prompt.value; + reporter.prompt = command.settings.prompt.value if (command.settings.version.value) reporter.info(null, versionMsg, true) else if (command.settings.help.value) @@ -118,7 +121,7 @@ object CompileServer extends SocketServer { compiler.settings = command.settings compiler.reporter = reporter } else { - if (args exists ("-verbose" ==)) + if (args contains "-verbose") out.println("[Starting new Scala compile server instance]") compiler = new Global(command.settings, reporter) { override def inform(msg: String) = out.println(msg) |