Skip to content

Track depth of typed holes in lexer #1364

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

Open
LTeuse wants to merge 4 commits into
base: main
Choose a base branch
from
+49 −4
Open

Track depth of typed holes in lexer #1364

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efde3f0
add a check if we are in hole in Lexer/DepthTracker
LTeuse Apr 10, 2026
2c73a13
add holes checks
LTeuse Apr 10, 2026
608f702
add nested block hole
LTeuse Apr 10, 2026
ae69612
add check for issue #1301
LTeuse Apr 10, 2026
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
12 changes: 8 additions & 4 deletions effekt/shared/src/main/scala/effekt/Lexer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ object Position {
* interpolation boundaries. When we see ${, we record the current brace depth
* and know the interpolation ends when we return to that depth.
*/
case class DepthTracker(var parens: Int, var braces: Int, var brackets: Int)
case class DepthTracker(var parens: Int, var braces: Int, var brackets: Int, var holes: Boolean)

/**
* Never throws exceptions - always returns Error tokens for errors.
Expand All @@ -246,7 +246,7 @@ class Lexer(source: Source) extends Iterator[Token] {

// String interpolation state
private val delimiters = mutable.Stack[Delimiter]()
private val depthTracker = DepthTracker(0, 0, 0)
private val depthTracker = DepthTracker(0, 0, 0, false)
private val interpolationDepths = mutable.Stack[Int]()

/**
Expand Down Expand Up @@ -444,7 +444,9 @@ class Lexer(source: Source) extends Iterator[Token] {
case ('<', '<') => advance2With(TokenKind.`<<`)
case ('<', '=') => advance2With(TokenKind.`<=`)
case ('<', '>') => advance2With(TokenKind.`<>`)
case ('<', '{') => advance2With(TokenKind.`<{`)
case ('<', '{') =>
depthTracker.holes = true
advance2With(TokenKind.`<{`)
case ('<', '~') => advance2With(TokenKind.`<~`)
case ('<', _) => advanceWith(TokenKind.`<`)

Expand Down Expand Up @@ -480,7 +482,9 @@ class Lexer(source: Source) extends Iterator[Token] {
case ('$', _) =>
advanceWith(TokenKind.Error(LexerError.UnknownChar('$')))

case ('}', '>') => advance2With(TokenKind.`}>`)
case ('}', '>') if depthTracker.holes =>
depthTracker.holes = false
advance2With(TokenKind.`}>`)
case ('}', _) if isAtInterpolationBoundary =>
interpolationDepths.pop()
depthTracker.braces -= 1
Expand Down
Loading