Merge pull request #7002 from dotty-staging/fix-do-while

odersky · web-flow · commit de43ee12d0cd · 2019-08-07T11:05:05.000+02:00
Fix do/while error message and add tests
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -1332,7 +1332,7 @@ object Parsers {
       case DO =>
         in.errorOrMigrationWarning(
           i"""`do <body> while <cond>' is no longer supported,
-             |use `while {<body> ; <cond>} do ()' instead.
+             |use `while ({<body> ; <cond>}) ()' instead.
              |The statement can be rewritten automatically under -language:Scala2 -migration -rewrite.
            """)
         val start = in.skipToken()
@@ -1353,7 +1353,7 @@ object Parsers {
             }
             patch(source, cond.span.endPos, "}) ()")
           }
-          WhileDo(Block(body :: Nil, cond), Literal(Constant(())))
+          WhileDo(Block(body, cond), Literal(Constant(())))
         }
       case TRY =>
         val tryOffset = in.offset
diff --git a/tests/pos-scala2/doWhile.scala b/tests/pos-scala2/doWhile.scala
@@ -0,0 +1,29 @@
+class Test {
+  do {
+    val x = 1
+    println(x)
+  } while {
+    val x = "a"
+    println(x)
+    true
+  }
+
+  do {
+    val x = 1
+  } while {
+    val x = "a"
+    true
+  }
+
+  val x: Int = 3
+  do {
+    val x = ""
+  } while (x == 2)
+
+  do (x == 3)
+  while {
+    val x = "a"
+    true
+  }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -1332,7 +1332,7 @@ object Parsers {`
`1332`	`1332`	`case DO =>`
`1333`	`1333`	`in.errorOrMigrationWarning(`
`1334`	`1334`	i"""`do <body> while <cond>' is no longer supported,
`1335`		- \|use `while {<body> ; <cond>} do ()' instead.
	`1335`	+ \|use `while ({<body> ; <cond>}) ()' instead.
`1336`	`1336`	`\|The statement can be rewritten automatically under -language:Scala2 -migration -rewrite.`
`1337`	`1337`	`""")`
`1338`	`1338`	`val start = in.skipToken()`
`@@ -1353,7 +1353,7 @@ object Parsers {`
`1353`	`1353`	`}`
`1354`	`1354`	`patch(source, cond.span.endPos, "}) ()")`
`1355`	`1355`	`}`
`1356`		`- WhileDo(Block(body :: Nil, cond), Literal(Constant(())))`
	`1356`	`+ WhileDo(Block(body, cond), Literal(Constant(())))`
`1357`	`1357`	`}`
`1358`	`1358`	`case TRY =>`
`1359`	`1359`	`val tryOffset = in.offset`