diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-04-21 20:31:04 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-04-23 12:46:48 +0200 |
| commit | 43f7a86e931045c30575e4f0e5a6cd542dc0a380 (patch) | |
| tree | c4fa310c4538f08e30dbd0b47a44663f2a9c59b5 /src/scalap | |
| parent | f55dd2084eca97c576a982473ab6701f98fb79a7 (diff) | |
| download | scala-43f7a86e931045c30575e4f0e5a6cd542dc0a380.tar.gz scala-43f7a86e931045c30575e4f0e5a6cd542dc0a380.tar.bz2 scala-43f7a86e931045c30575e4f0e5a6cd542dc0a380.zip | |
remove recursive classpath implementation
Diffstat (limited to 'src/scalap')
| -rw-r--r-- | src/scalap/scala/tools/scalap/Main.scala | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala index 3d2bfd7251..2ae43306a7 100644 --- a/src/scalap/scala/tools/scalap/Main.scala +++ b/src/scalap/scala/tools/scalap/Main.scala @@ -16,8 +16,6 @@ import scala.tools.nsc.classpath.FlatClassPathFactory import scala.tools.nsc.io.AbstractFile import scala.tools.nsc.settings.ClassPathRepresentationType import scala.tools.nsc.util.ClassFileLookup -import scala.tools.nsc.util.ClassPath.DefaultJavaContext -import scala.tools.nsc.util.JavaClassPath import scala.tools.util.PathResolverFactory import scalax.rules.scalasig._ @@ -101,7 +99,7 @@ class Main { /** Executes scalap with the given arguments and classpath for the * class denoted by `classname`. */ - def process(args: Arguments, path: ClassFileLookup[AbstractFile])(classname: String): Unit = { + def process(args: Arguments, path: ClassFileLookup)(classname: String): Unit = { // find the classfile val encName = classname match { case "scala.AnyRef" => "java.lang.Object" @@ -145,7 +143,6 @@ object Main extends Main { val verbose = "-verbose" val version = "-version" - val classPathImplType = "-YclasspathImpl" val disableFlatClassPathCaching = "-YdisableFlatCpCaching" val logClassPath = "-Ylog-classpath" } @@ -183,7 +180,6 @@ object Main extends Main { val settings = new Settings() - arguments getArgument opts.classPathImplType foreach settings.YclasspathImpl.tryToSetFromPropertyValue settings.YdisableFlatCpCaching.value = arguments contains opts.disableFlatClassPathCaching settings.Ylogcp.value = arguments contains opts.logClassPath @@ -205,19 +201,14 @@ object Main extends Main { .withOption(opts.help) .withOptionalArg(opts.classpath) .withOptionalArg(opts.cp) - // TODO three temporary, hidden options to be able to test different classpath representations - .withOptionalArg(opts.classPathImplType) + // TODO two temporary, hidden options to be able to test different classpath representations .withOption(opts.disableFlatClassPathCaching) .withOption(opts.logClassPath) .parse(args) private def createClassPath(cpArg: Option[String], settings: Settings) = cpArg match { - case Some(cp) => settings.YclasspathImpl.value match { - case ClassPathRepresentationType.Flat => - AggregateFlatClassPath(new FlatClassPathFactory(settings).classesInExpandedPath(cp)) - case ClassPathRepresentationType.Recursive => - new JavaClassPath(DefaultJavaContext.classesInExpandedPath(cp), DefaultJavaContext) - } + case Some(cp) => + AggregateFlatClassPath(new FlatClassPathFactory(settings).classesInExpandedPath(cp)) case _ => settings.classpath.value = "." // include '.' in the default classpath SI-6669 PathResolverFactory.create(settings).result |