Skip to content

Fix bug in reflect.TreeUtils #5581

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.

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
Dec 9, 2018
Merged
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
8 changes: 4 additions & 4 deletions library/src/scala/tasty/reflect/TreeUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ trait TreeUtils
def foldCaseDefs(x: X, trees: Iterable[CaseDef])(implicit ctx: Context): X = (x /: trees)(foldCaseDef)
def foldTypeCaseDefs(x: X, trees: Iterable[TypeCaseDef])(implicit ctx: Context): X = (x /: trees)(foldTypeCaseDef)
def foldPatterns(x: X, trees: Iterable[Pattern])(implicit ctx: Context): X = (x /: trees)(foldPattern)
private def foldParents(x: X, trees: Iterable[TermOrTypeTree])(implicit ctx: Context): X = (x /: trees)(foldOverTermOrTypeTree)
private def foldParents(x: X, trees: Iterable[TermOrTypeTree])(implicit ctx: Context): X = (x /: trees)(foldTermOrTypeTree)

def foldOverTree(x: X, tree: Tree)(implicit ctx: Context): X = {
def localCtx(definition: Definition): Context = definition.symbol.localContext
Expand Down Expand Up @@ -124,9 +124,9 @@ trait TreeUtils
case Pattern.TypeTest(tpt) => foldTypeTree(x, tpt)
}

private def foldOverTermOrTypeTree(x: X, tree: TermOrTypeTree)(implicit ctx: Context): X = tree match {
case IsTerm(termOrTypeTree) => foldOverTree(x, termOrTypeTree)
case IsTypeTree(termOrTypeTree) => foldOverTypeTree(x, termOrTypeTree)
private def foldTermOrTypeTree(x: X, tree: TermOrTypeTree)(implicit ctx: Context): X = tree match {
case IsTerm(termOrTypeTree) => foldTree(x, termOrTypeTree)
case IsTypeTree(termOrTypeTree) => foldTypeTree(x, termOrTypeTree)
}

}
Expand Down