Skip to content

Normalize blocks with no statements in quotes #5263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2018
Merged

Normalize blocks with no statements in quotes #5263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/quoted/TreeCleaner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class TreeCleaner extends tpd.TreeMap {
case stat => stat :: Nil
}
expr1 match {
case Block(stats3, expr3) => Block(flatStats ::: stats3, expr3)
case expr3 => Block(flatStats, expr3)
case Block(stats3, expr3) => seq(flatStats ::: stats3, expr3)
case expr3 => seq(flatStats, expr3)
}
case tree1: TypeTree => TypeTree(tree1.tpe.subst(aliasesSyms, aliasesTypes))
case tree1: Ident => aliases.get(tree1.symbol).getOrElse(tree1)
Expand Down
4 changes: 1 addition & 3 deletions tests/run-with-compiler/i3847-b.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
{
new scala.Array[scala.List[scala.Int]](1)
}
new scala.Array[scala.List[scala.Int]](1)
8 changes: 2 additions & 6 deletions tests/run-with-compiler/i4350.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
{
null.asInstanceOf[lang.Object]
}
{
null.asInstanceOf[scala.Predef.String]
}
null.asInstanceOf[lang.Object]
null.asInstanceOf[scala.Predef.String]
12 changes: 3 additions & 9 deletions tests/run-with-compiler/shonan-hmm.check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ List(25, 30, 20, 43, 44)

{
val arr: scala.Array[scala.Array[scala.Int]] = {
val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)({
scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]])
})
val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)(scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]]))
array.update(0, {
val array$2: scala.Array[scala.Int] = new scala.Array[scala.Int](5)
array$2.update(0, 5)
Expand Down Expand Up @@ -111,9 +109,7 @@ List(25, 30, 20, 43, 44)

{
val arr: scala.Array[scala.Array[scala.Int]] = {
val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)({
scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]])
})
val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)(scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]]))
array.update(0, {
val array$2: scala.Array[scala.Int] = new scala.Array[scala.Int](5)
array$2.update(0, 5)
Expand Down Expand Up @@ -177,9 +173,7 @@ List(25, 30, 20, 43, 44)

{
val arr: scala.Array[scala.Array[scala.Int]] = {
val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)({
scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]])
})
val array: scala.Array[scala.Array[scala.Int]] = dotty.runtime.Arrays.newGenericArray[scala.Array[scala.Int]](5)(scala.reflect.ClassTag.apply[scala.Array[scala.Int]](scala.Predef.classOf[scala.Array[scala.Int]]))
array.update(0, {
val array$2: scala.Array[scala.Int] = new scala.Array[scala.Int](5)
array$2.update(0, 5)
Expand Down