Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion compiler/src/dotty/tools/dotc/transform/Flatten.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,20 @@ class Flatten extends MiniPhaseTransform with SymTransformer { thisTransform =>
else ref
}

private val liftedDefs = new mutable.ListBuffer[Tree]
private var liftedDefs = new mutable.ListBuffer[Tree]
private var liftedDefsQueue = List.empty[mutable.ListBuffer[Tree]]

override def prepareForPackageDef(tree: PackageDef)(implicit ctx: Context) = {
liftedDefsQueue = liftedDefs :: liftedDefsQueue
liftedDefs = new mutable.ListBuffer[Tree]
this
}

override def transformPackageDef(tree: PackageDef)(implicit ctx: Context, info: TransformerInfo) = {
liftedDefs = liftedDefsQueue.head
liftedDefsQueue = liftedDefsQueue.tail
tree
}

private def liftIfNested(tree: Tree)(implicit ctx: Context, info: TransformerInfo) =
if (ctx.owner is Package) tree
Expand Down
5 changes: 5 additions & 0 deletions tests/pos/i3000.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class Foo {
new Object { }
}

package bar { }
2 changes: 2 additions & 0 deletions tests/run/i3000b.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Foo$$anon$1
bar.Bar$$anon$2
18 changes: 18 additions & 0 deletions tests/run/i3000b.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
object Test {
def main(args: Array[String]): Unit = {
new Foo
new bar.Bar
}
}

class Foo {
new Object { println(this.getClass.getName) }
}

package bar {
package baz { }
class Bar {
new Object { println(this.getClass.getName) }
}
package quxx { }
}