diff options
author | Paul Phillips <paulp@improving.org> | 2010-12-05 02:56:08 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-12-05 02:56:08 +0000 |
commit | 77eb8fefec3e62ead95c7d409ec5a28f30289ec3 (patch) | |
tree | 5e035714a7e6363d1ae7f712d5b1f73c1d27d79e /src/compiler/scala/tools/nsc/Main.scala | |
parent | 626e38940b72f5e8445ecbece4d41996b5e2842e (diff) | |
download | scala-77eb8fefec3e62ead95c7d409ec5a28f30289ec3.tar.gz scala-77eb8fefec3e62ead95c7d409ec5a28f30289ec3.tar.bz2 scala-77eb8fefec3e62ead95c7d409ec5a28f30289ec3.zip |
Mopping up after the deprecation of exit and er...
Mopping up after the deprecation of exit and error. It is decidedly
non-trivial (at least for the IDE-impaired) to be completely sure of
which error function was being called when there were about twenty with
the same signature in trunk and they are being variously inherited,
imported, shadowed, etc. So although I was careful, the possibility
exists that something is now calling a different "error" function than
before. Caveat programmer.
(And let's all make it our policy not to name anything "error" or "exit"
from here on out....) No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/Main.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/Main.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala index 37fb5952e3..7f79c69f52 100644 --- a/src/compiler/scala/tools/nsc/Main.scala +++ b/src/compiler/scala/tools/nsc/Main.scala @@ -26,21 +26,21 @@ object Main extends AnyRef with EvalLoop { var reporter: ConsoleReporter = _ - def error(msg: String) { + private def scalacError(msg: String) { reporter.error(FakePos("scalac"), msg + "\n scalac -help gives more information") } def resident(compiler: Global) { loop { line => val args = line.split(' ').toList - val command = new CompilerCommand(args, new Settings(error)) + val command = new CompilerCommand(args, new Settings(scalacError)) compiler.reporter.reset new compiler.Run() compile command.files } } def process(args: Array[String]) { - val ss = new Settings(error) + val ss = new Settings(scalacError) reporter = new ConsoleReporter(ss) val command = new CompilerCommand(args.toList, ss) val settings = command.settings @@ -120,7 +120,7 @@ object Main extends AnyRef with EvalLoop { def main(args: Array[String]) { process(args) - exit(if (reporter.hasErrors) 1 else 0) + system exit (if (reporter.hasErrors) 1 else 0) } } |