summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-03-11 00:14:16 -0500
committerHubert Plociniczak <hubert.plociniczak@gmail.com>2012-07-17 12:04:38 +0200
commit32fd97df41bb2e99018f024f41b06490e41bd7ad (patch)
tree4b40fb915776892da3de3227f771a205a2c38a82 /src/partest
parent0cfd858a38ddf0ac83d9bbefe85110f88dc707c0 (diff)
downloadscala-32fd97df41bb2e99018f024f41b06490e41bd7ad.tar.gz
scala-32fd97df41bb2e99018f024f41b06490e41bd7ad.tar.bz2
scala-32fd97df41bb2e99018f024f41b06490e41bd7ad.zip
Fix for SI-5385.
Nodes which hit EOF with no whitespace afterward had wrong position.
Diffstat (limited to 'src/partest')
-rw-r--r--src/partest/scala/tools/partest/DirectTest.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/DirectTest.scala b/src/partest/scala/tools/partest/DirectTest.scala
index 4e7f36bdc9..5b4e1b4b25 100644
--- a/src/partest/scala/tools/partest/DirectTest.scala
+++ b/src/partest/scala/tools/partest/DirectTest.scala
@@ -38,7 +38,8 @@ abstract class DirectTest extends App {
// new compiler
def newCompiler(args: String*): Global = {
val settings = newSettings((CommandLineParser tokenize extraSettings) ++ args.toList)
- new Global(settings)
+ if (settings.Yrangepos.value) new Global(settings) with interactive.RangePositions
+ else new Global(settings)
}
def newSources(sourceCodes: String*) = sourceCodes.toList.zipWithIndex map {
case (src, idx) => new BatchSourceFile("newSource" + (idx + 1), src)
@@ -69,7 +70,7 @@ abstract class DirectTest extends App {
/** Constructor/main body **/
try show()
- catch { case t => println(t) ; t.printStackTrace ; sys.exit(1) }
+ catch { case t => println(t.getMessage) ; t.printStackTrace ; sys.exit(1) }
/** Debugger interest only below this line **/
protected def isDebug = (sys.props contains "partest.debug") || (sys.env contains "PARTEST_DEBUG")