diff options
author | Martin Odersky <odersky@gmail.com> | 2014-11-10 18:29:58 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2014-11-10 18:29:58 +0100 |
commit | f7a4d811f769583be13a376a3daedd2eadd31447 (patch) | |
tree | 1c82858472d08575dfb6815d9c70cee92095a79a /test/test | |
parent | c9d7eefc0989066e85ca598dff2639d412aabbee (diff) | |
download | dotty-f7a4d811f769583be13a376a3daedd2eadd31447.tar.gz dotty-f7a4d811f769583be13a376a3daedd2eadd31447.tar.bz2 dotty-f7a4d811f769583be13a376a3daedd2eadd31447.zip |
Drop modifiers as separate data from MemberDef trees
Typed MemberDef trees now take the modifiers from their symbol's data.
Diffstat (limited to 'test/test')
-rw-r--r-- | test/test/DeSugarTest.scala | 16 | ||||
-rw-r--r-- | test/test/parsePackage.scala | 4 | ||||
-rw-r--r-- | test/test/transform/TreeTransformerTest.scala | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/test/test/DeSugarTest.scala b/test/test/DeSugarTest.scala index c628a9ad1..66fb70158 100644 --- a/test/test/DeSugarTest.scala +++ b/test/test/DeSugarTest.scala @@ -57,12 +57,12 @@ class DeSugarTest extends ParserTest { cpy.SeqLiteral(tree1)(transform(elems)) case UnApply(fun, implicits, patterns) => cpy.UnApply(tree1)(transform(fun, Expr), transform(implicits), transform(patterns)) - case ValDef(mods, name, tpt, rhs) => - cpy.ValDef(tree1)(mods, name, transform(tpt, Type), transform(rhs)) - case DefDef(mods, name, tparams, vparamss, tpt, rhs) => - cpy.DefDef(tree1)(mods, name, transformSub(tparams), vparamss mapConserve (transformSub(_)), transform(tpt, Type), transform(rhs)) - case tree1 @ TypeDef(mods, name, rhs) => - cpy.TypeDef(tree1)(mods, name, transform(rhs, Type), transformSub(tree1.tparams)) + case ValDef(name, tpt, rhs) => + cpy.ValDef(tree1)(name, transform(tpt, Type), transform(rhs)) + case DefDef(name, tparams, vparamss, tpt, rhs) => + cpy.DefDef(tree1)(name, transformSub(tparams), vparamss mapConserve (transformSub(_)), transform(tpt, Type), transform(rhs)) + case tree1 @ TypeDef(name, rhs) => + cpy.TypeDef(tree1)(name, transform(rhs, Type), transformSub(tree1.tparams)) case Template(constr, parents, self, body) => cpy.Template(tree1)(transformSub(constr), transform(parents), transformSub(self), transform(body, Expr)) case Thicket(trees) => @@ -75,8 +75,8 @@ class DeSugarTest extends ParserTest { def firstClass(stats: List[Tree]): String = stats match { case Nil => "<empty>" - case TypeDef(_, name, _) :: _ => name.toString - case ModuleDef(_, name, _) :: _ => name.toString + case TypeDef(name, _) :: _ => name.toString + case ModuleDef(name, _) :: _ => name.toString case (pdef: PackageDef) :: _ => firstClass(pdef) case stat :: stats => firstClass(stats) } diff --git a/test/test/parsePackage.scala b/test/test/parsePackage.scala index 7b0d16b2a..ceebadd0d 100644 --- a/test/test/parsePackage.scala +++ b/test/test/parsePackage.scala @@ -25,8 +25,8 @@ object parsePackage extends ParserTest { tree case InterpolatedString(id, parts, elems) => InterpolatedString(id, parts map (transformSub(_)), elems map transform) - case ModuleDef(mods, name, impl) => - ModuleDef(mods, name, transformSub(impl)) + case mdef @ ModuleDef(name, impl) => + ModuleDef(name, transformSub(impl)).withMods(mdef.mods) case Function(params, body) => Function(params map transform, body) case InfixOp(l, o, r) => diff --git a/test/test/transform/TreeTransformerTest.scala b/test/test/transform/TreeTransformerTest.scala index ddd83661f..a1839f2a1 100644 --- a/test/test/transform/TreeTransformerTest.scala +++ b/test/test/transform/TreeTransformerTest.scala @@ -66,7 +66,7 @@ class TreeTransformerTest extends DottyTest { Assert.assertTrue("transformation of children succeeded", tree.rhs.toString == "Literal(Constant(-1))" ) - tpd.cpy.ValDef(tree)(tree.mods, tree.name, tree.tpt, tpd.Literal(Constant(2))) + tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(2))) } init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId) @@ -102,7 +102,7 @@ class TreeTransformerTest extends DottyTest { Assert.assertTrue("transformation of children succeeded", tree.rhs.toString == "Literal(Constant(-1))" ) - tpd.cpy.ValDef(tree)(tree.mods, tree.name, tree.tpt, tpd.Literal(Constant(2))) + tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(2))) } init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId) @@ -113,7 +113,7 @@ class TreeTransformerTest extends DottyTest { Assert.assertTrue("transformation of children succeeded", tree.rhs.toString == "Literal(Constant(2))" ) - tpd.cpy.ValDef(tree)(tree.mods, tree.name, tree.tpt, tpd.Literal(Constant(3))) + tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(3))) } init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId) @@ -150,7 +150,7 @@ class TreeTransformerTest extends DottyTest { Assert.assertTrue("transformation of children succeeded", tree.rhs.toString == "Literal(Constant(-3))" ) - tpd.cpy.ValDef(tree)(tree.mods, tree.name, tree.tpt, transformFollowing(tpd.Literal(Constant(2)))) + tpd.cpy.ValDef(tree)(rhs = transformFollowing(tpd.Literal(Constant(2)))) } init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId) @@ -181,7 +181,7 @@ class TreeTransformerTest extends DottyTest { Assert.assertTrue("transformation of children succeeded", tree.rhs.toString == "Literal(Constant(-3))" ) - transformFollowing(tpd.cpy.ValDef(tree)(tree.mods, tree.name, tree.tpt, tpd.Literal(Constant(3)))) + transformFollowing(tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(3)))) } init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId) |