Skip to content

Enable UnrollDefinitions phase in REPL frontend phases #23433

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
Jun 27, 2025
+33 −1
Merged

Enable UnrollDefinitions phase in REPL frontend phases #23433

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
3 changes: 2 additions & 1 deletion compiler/src/dotty/tools/repl/ReplCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import dotty.tools.dotc.core.Phases.Phase
import dotty.tools.dotc.core.StdNames.*
import dotty.tools.dotc.core.Symbols.*
import dotty.tools.dotc.reporting.Diagnostic
import dotty.tools.dotc.transform.{CheckUnused, CheckShadowing, PostTyper}
import dotty.tools.dotc.transform.{CheckUnused, CheckShadowing, PostTyper, UnrollDefinitions}
import dotty.tools.dotc.typer.ImportInfo.{withRootImports, RootRef}
import dotty.tools.dotc.typer.TyperPhase
import dotty.tools.dotc.util.Spans.*
Expand Down Expand Up @@ -40,6 +40,7 @@ class ReplCompiler extends Compiler:
List(CheckUnused.PostTyper(), CheckShadowing()),
List(CollectTopLevelImports()),
List(PostTyper()),
List(UnrollDefinitions()),
)

def newRun(initCtx: Context, state: State): Run =
Expand Down
31 changes: 31 additions & 0 deletions compiler/test/dotty/tools/repl/ReplCompilerTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,3 +582,34 @@ class ReplHighlightTests extends ReplTest(ReplTest.defaultOptions.filterNot(_.st
case class Tree(left: Tree, right: Tree)
def deepTree(depth: Int): Tree
deepTree(300)""")

class ReplUnrollTests extends ReplTest(ReplTest.defaultOptions ++ Seq("-experimental", "-Xprint:pickler")):
override val redirectOutput = true
@Test def i23408: Unit = initially:
run("""
import scala.annotation.unroll
case class Foo(x: Int, @unroll y: Option[String] = None)"""
)
val expected = List(
"def copy(x: Int, y: Option[String]): Foo = new Foo(x, y)",
"def copy(x: Int): Foo = this.copy(x, this.copy$default$2)",
"def copy$default$1: Int @uncheckedVariance = Foo.this.x",
"def copy$default$2: Option[String] @uncheckedVariance = Foo.this.y",
"def apply(x: Int, y: Option[String]): Foo = new Foo(x, y)",
"def apply(x: Int): Foo = this.apply(x, Foo.$lessinit$greater$default$2)",
"""def fromProduct(x$0: Product): Foo.MirroredMonoType = {
val arity: Int = x$0.productArity
val x$1: Int = x$0.productElement(0).$asInstanceOf[Int]
val y$1: Option[String] = (if arity > 1 then x$0.productElement(1) else Foo.$lessinit$greater$default$2).$asInstanceOf[Option[String]]
new Foo(x$1, y$1)
}"""
)
def trimWhitespaces(input: String): String = input.replaceAll("\\s+", " ")
val output = storedOutput()
val normalizedOutput = trimWhitespaces(output)
expected.foreach: defn =>
val normalizedDefn = trimWhitespaces(defn)
assertTrue(
s"Output: '$output' did not contain expected definition: ${defn}",
normalizedOutput.contains(normalizedDefn)
)
Loading