Skip to content

TreeMap transform updates owner as it's done TreeAccumulator #2826

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
Jul 9, 2017
Merged

TreeMap transform updates owner as it's done TreeAccumulator #2826

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
9 changes: 8 additions & 1 deletion compiler/src/dotty/tools/dotc/ast/Trees.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,10 @@ object Trees {

abstract class TreeMap(val cpy: TreeCopier = inst.cpy) {

def transform(tree: Tree)(implicit ctx: Context): Tree =
def transform(tree: Tree)(implicit ctx: Context): Tree = {
def localCtx =
if (tree.hasType && tree.symbol.exists) ctx.withOwner(tree.symbol) else ctx

if (skipTransform(tree)) tree
else tree match {
case Ident(name) =>
Expand Down Expand Up @@ -1180,12 +1183,15 @@ object Trees {
case EmptyValDef =>
tree
case tree @ ValDef(name, tpt, _) =>
implicit val ctx = localCtx
val tpt1 = transform(tpt)
val rhs1 = transform(tree.rhs)
cpy.ValDef(tree)(name, tpt1, rhs1)
case tree @ DefDef(name, tparams, vparamss, tpt, _) =>
implicit val ctx = localCtx
cpy.DefDef(tree)(name, transformSub(tparams), vparamss mapConserve (transformSub(_)), transform(tpt), transform(tree.rhs))
case tree @ TypeDef(name, rhs) =>
implicit val ctx = localCtx
cpy.TypeDef(tree)(name, transform(rhs))
case tree @ Template(constr, parents, self, _) =>
cpy.Template(tree)(transformSub(constr), transform(parents), transformSub(self), transformStats(tree.body))
Expand All @@ -1201,6 +1207,7 @@ object Trees {
case _ if ctx.reporter.errorsReported =>
tree
}
}

def transformStats(trees: List[Tree])(implicit ctx: Context): List[Tree] =
transform(trees)
Expand Down