diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/ScriptRunner.scala | 13 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/SourceFile.scala | 14 |
2 files changed, 6 insertions, 21 deletions
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala index 0cd5fe1f6a..b8629279c2 100644 --- a/src/compiler/scala/tools/nsc/ScriptRunner.scala +++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala @@ -195,16 +195,7 @@ object ScriptRunner settings: GenericRunnerSettings, scriptFileIn: String): Boolean = { - val scriptFile = Path(scriptFileIn).toAbsolute.path - - { - import settings._ - for (setting <- List(classpath, sourcepath, bootclasspath, extdirs, outdir)) { - // DBG("%s = %s".format(setting.name, setting.value)) - setting.value = PathResolver.makeAbsolute(setting.value) - } - } - + val scriptFile = Path(scriptFileIn).toAbsolute.path val compSettingNames = new Settings(error).settingSet.toList map (_.name) val compSettings = settings.settingSet.toList filter (compSettingNames contains _.name) val coreCompArgs = compSettings flatMap (_.unparse) @@ -301,7 +292,7 @@ object ScriptRunner scriptArgs: List[String]): Boolean = { val pr = new PathResolver(settings) - val classpath = pr.asURLs :+ new URL(compiledLocation) + val classpath = pr.asURLs :+ File(compiledLocation).toURL try { ObjectRunner.run( diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala index e864c1e153..57d2cc782f 100644 --- a/src/compiler/scala/tools/nsc/util/SourceFile.scala +++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala @@ -154,17 +154,11 @@ extends BatchSourceFile(name, contents) /** The usual constructor. Specify a name for the compound file and * a list of component sources. */ - def this(name: String, components: BatchSourceFile*) = { - this( - name, - components.toList, - Array.concat(components.map(comp => - CompoundSourceFile.stripSU(comp.content).toArray):_*)) - } + def this(name: String, components: BatchSourceFile*) = + this(name, components.toList, components flatMap (CompoundSourceFile stripSU _.content) toArray) /** Create an instance with the specified components and a generic name. */ - def this(components: BatchSourceFile*) = - this("(virtual file)", components.toList:_*) + def this(components: BatchSourceFile*) = this("(virtual file)", components: _*) override def positionInUltimateSource(position: Position) = { if (!position.isDefined) super.positionInUltimateSource(position) @@ -193,7 +187,7 @@ extends BatchSourceFile(name, contents) object CompoundSourceFile { private[util] def stripSU(chars: Array[Char]) = if (chars.length > 0 && chars.last == SU) - chars.slice(0, chars.length-1) + chars dropRight 1 else chars } |