Skip to content
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

Jump to bottom

Fix #9879: allow top-level opaque type definitions in REPL #21753

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+31 −3
Draft

Fix #9879: allow top-level opaque type definitions in REPL #21753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0a1706
Allow opaque type def in repl
noti0na1 Sep 26, 2024
9a19ca0
Only allow opaque type def at outermost
noti0na1 Oct 4, 2024
e564d00
Add REPL test
noti0na1 Oct 11, 2024
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: 3 additions & 1 deletion compiler/src/dotty/tools/dotc/parsing/Parsers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4684,7 +4684,7 @@ object Parsers {
* | Expr1
* |
*/
def blockStatSeq(): List[Tree] = checkNoEscapingPlaceholders {
def blockStatSeq(outermost: Boolean = false): List[Tree] = checkNoEscapingPlaceholders {
val stats = new ListBuffer[Tree]
while
var empty = false
Expand All @@ -4696,6 +4696,8 @@ object Parsers {
stats += closure(in.offset, Location.InBlock, modifiers(BitSet(IMPLICIT)))
else if isIdent(nme.extension) && followingIsExtension() then
stats += extension()
else if outermost && ctx.mode.is(Mode.Interactive) && isDefIntro(localModifierTokens) then
stats +++= localDef(in.offset)
else if isDefIntro(localModifierTokens, excludedSoftModifiers = Set(nme.`opaque`)) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't you remove opaque from excluded in interactive mode and outermost?

stats +++= localDef(in.offset)
else
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/repl/ParseResult.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ object ParseResult {

private def parseStats(using Context): List[untpd.Tree] = {
val parser = new Parser(ctx.source)
val stats = parser.blockStatSeq()
val stats = parser.blockStatSeq(outermost = true)
parser.accept(Tokens.EOF)
stats
}
Expand Down
28 changes: 27 additions & 1 deletion compiler/test/dotty/tools/repl/ReplCompilerTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,36 @@ class ReplCompilerTests extends ReplTest:
.andThen:
run("0") // check for crash
val last = lines()
println(last)
assertTrue(last(0), last(0) == ("Options incompatible with repl will be ignored: -Ybest-effort, -Ywith-best-effort-tasty"))
assertTrue(last(1), last(1) == ("val res0: Int = 0"))

@Test def `i9879`: Unit = initially:
run {
"""|opaque type A = Int; def getA: A = 0
|object Wrapper { opaque type A = Int; def getA: A = 1 }
|val x = getA
|val y = Wrapper.getA""".stripMargin
}
val expected = List(
"def getA: A",
"// defined object Wrapper",
"val x: A = 0",
"val y: Wrapper.A = 1"
)
assertEquals(expected, lines())

@Test def `i9879b`: Unit = initially:
run {
"""|def test =
| type A = Int
| opaque type B = String
| object Wrapper { opaque type C = Int }
| ()""".stripMargin
}
val all = lines()
assertEquals(6, all.length)
assertTrue(all.head.startsWith("-- [E103] Syntax Error"))
assertTrue(all.exists(_.trim().startsWith("| Illegal start of statement: this modifier is not allowed here")))

object ReplCompilerTests:

Expand Down
Loading