fix error messages

Author: adpi2

compiler/test/dotty/tools/debug/DebugStepAssert.scala

@@ -4,6 +4,8 @@ import com.sun.jdi.Location
 import dotty.tools.io.JPath
 import dotty.tools.readLines
 
+import scala.annotation.tailrec
+
 /**
  * A debug step and an associated assertion to validate the step.
  * A sequence of DebugStepAssert is parsed from the check file in tests/debug
@@ -41,8 +43,9 @@ private[debug] object DebugStepAssert:
     val multiLineError = s"error$trailing".r
     val allLines = readLines(checkFile.toFile)
 
+    @tailrec
     def loop(lines: List[String], acc: List[DebugStepAssert[?]]): List[DebugStepAssert[?]] =
-      given CheckFileLocation = CheckFileLocation(checkFile, allLines.size - lines.size + 1)
+      given location: CheckFileLocation = CheckFileLocation(checkFile, allLines.size - lines.size + 1)
       lines match
         case Nil => acc.reverse
         case break(className , lineStr) :: tail =>
@@ -66,18 +69,21 @@ private[debug] object DebugStepAssert:
           val step = DebugStepAssert(Eval(expr), assertion)
           loop(tail2, step :: acc)
         case trailing() :: tail => loop(tail, acc)
-        case invalid :: tail => throw new Exception(s"Cannot parse debug step: $invalid")
+        case invalid :: tail =>
+          throw new Exception(s"Cannot parse debug step: $invalid ($location)")
 
     def parseEvalAssertion(lines: List[String]): (Either[String, String] => Unit, List[String]) =
-      given CheckFileLocation = CheckFileLocation(checkFile, allLines.size - lines.size + 1)
+      given location: CheckFileLocation = CheckFileLocation(checkFile, allLines.size - lines.size + 1)
       lines match
         case Nil => throw new Exception(s"Missing result or error")
+        case trailing() :: tail => parseEvalAssertion(tail)
         case result(expected) :: tail => (checkResult(expected), tail)
         case error(expected) :: tail => (checkError(Seq(expected)), tail)
         case multiLineError() :: tail0 =>
           val (expected, tail1) = tail0.span(_.startsWith("  "))
           (checkError(expected.map(_.stripPrefix("  "))), tail1)
-        case invalid :: _ => throw new Exception(s"Cannot parse as result or error: $invalid")
+        case invalid :: _ =>
+          throw new Exception(s"Cannot parse as result or error: $invalid ($location)")
 
     loop(allLines, Nil)
   end parseCheckFile

compiler/test/dotty/tools/debug/DebugTests.scala

@@ -15,7 +15,7 @@ class DebugTests:
   import DebugTests.*
   @Test def debug: Unit =
     implicit val testGroup: TestGroup = TestGroup("debug")
-    // compileFile("tests/debug/eval-mutable-variables.scala", TestConfiguration.defaultOptions).checkDebug()
+    // compileFile("tests/debug/eval-private-members-in-parent.scala", TestConfiguration.defaultOptions).checkDebug()
     compileFilesInDir("tests/debug", TestConfiguration.defaultOptions).checkDebug()
 
 object DebugTests extends ParallelTesting:
@@ -110,6 +110,7 @@ object DebugTests extends ParallelTesting:
             assert(result)
         catch
           case _: TimeoutException => throw new DebugStepException("Timeout", step.location)
+          case e: DebugStepException => throw e
           case NonFatal(e) =>
             throw new Exception(s"Debug step failed unexpectedly: ${step.location}", e)
       end for