diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-17 04:39:38 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-17 04:39:38 -0700 |
| commit | fe3fa3d0ad60a651a3223d223a55051667dda156 (patch) | |
| tree | 59977535daaa33c2ab7415c8b8a906ed6daed96e | |
| parent | 1bdc43ccf3c411c5f1455e3cfb365ad12bebb0ea (diff) | |
| parent | aa90f538dbab5036867b80f22490c1841006fa08 (diff) | |
| download | scala-fe3fa3d0ad60a651a3223d223a55051667dda156.tar.gz scala-fe3fa3d0ad60a651a3223d223a55051667dda156.tar.bz2 scala-fe3fa3d0ad60a651a3223d223a55051667dda156.zip | |
Merge pull request #1307 from sgolodetz/rangeposfix
Make the scalac Ant task recognise -Yrangepos
| -rw-r--r-- | src/compiler/scala/tools/ant/Scalac.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala index c6809fb48e..bcb7d494b6 100644 --- a/src/compiler/scala/tools/ant/Scalac.scala +++ b/src/compiler/scala/tools/ant/Scalac.scala @@ -19,6 +19,7 @@ import org.apache.tools.ant.util.facade.{FacadeTaskHelper, ImplementationSpecificArgument} import scala.tools.nsc.{Global, Settings, CompilerCommand} +import scala.tools.nsc.interactive.RangePositions import scala.tools.nsc.io.{Path => SPath} import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} @@ -518,7 +519,10 @@ class Scalac extends ScalaMatchingTask with ScalacShared { new Settings(error) protected def newGlobal(settings: Settings, reporter: Reporter) = - new Global(settings, reporter) + if (settings.Yrangepos.value) + new Global(settings, reporter) with RangePositions + else + new Global(settings, reporter) /*============================================================================*\ ** The big execute method ** |