diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-07-12 15:36:28 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-14 12:09:30 +0200 |
| commit | 41f4497cc57f5e010df10a9f5a98c9815c1c36fd (patch) | |
| tree | ea478ad1bc9a17693ff0d09b67657b17c0588b41 /src/compiler/scala/tools/nsc | |
| parent | 1a73aa087e9ccd7584d91c653a8b61905da7c904 (diff) | |
| download | scala-41f4497cc57f5e010df10a9f5a98c9815c1c36fd.tar.gz scala-41f4497cc57f5e010df10a9f5a98c9815c1c36fd.tar.bz2 scala-41f4497cc57f5e010df10a9f5a98c9815c1c36fd.zip | |
Attempt #2 to optimize findMember
Diffstat (limited to 'src/compiler/scala/tools/nsc')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Driver.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/Main.scala | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/Driver.scala b/src/compiler/scala/tools/nsc/Driver.scala index 0051c3bdec..15e2929ff1 100644 --- a/src/compiler/scala/tools/nsc/Driver.scala +++ b/src/compiler/scala/tools/nsc/Driver.scala @@ -1,10 +1,12 @@ package scala.tools.nsc import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} -import Properties.{ versionString, copyrightString } +import Properties.{ versionString, copyrightString, residentPromptString } import scala.reflect.internal.util.{ BatchSourceFile, FakePos } abstract class Driver { + + val prompt = residentPromptString val versionMsg = "Scala compiler " + versionString + " -- " + diff --git a/src/compiler/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala index 19c872b6d3..8b7e76e994 100644 --- a/src/compiler/scala/tools/nsc/Main.scala +++ b/src/compiler/scala/tools/nsc/Main.scala @@ -12,15 +12,13 @@ import scala.tools.nsc.interactive.{ RefinedBuildManager, SimpleBuildManager } import scala.tools.nsc.io.AbstractFile import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} import scala.reflect.internal.util.{ BatchSourceFile, FakePos } //{Position} -import Properties.{ versionString, copyrightString, residentPromptString, msilLibPath } +import Properties.msilLibPath /** The main class for NSC, a compiler for the programming - * language Scala. + * language Scala. */ object Main extends Driver with EvalLoop { - val prompt = residentPromptString - def resident(compiler: Global) { loop { line => val args = line.split(' ').toList |