diff options
author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-11-17 17:20:50 +0100 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-11-22 20:10:23 +0100 |
commit | 38cebe090a97930fe872d37370c66f72da360409 (patch) | |
tree | 27a8881eb645113e0b31cc1885256da489194159 /src/dotty/tools/dotc/transform/TreeTransform.scala | |
parent | 22c9a9bfc96284dc3b827c1e8a6a2a4331ebc9c3 (diff) | |
download | dotty-38cebe090a97930fe872d37370c66f72da360409.tar.gz dotty-38cebe090a97930fe872d37370c66f72da360409.tar.bz2 dotty-38cebe090a97930fe872d37370c66f72da360409.zip |
Adapting branch to absence of modifiers in trees.
Diffstat (limited to 'src/dotty/tools/dotc/transform/TreeTransform.scala')
-rw-r--r-- | src/dotty/tools/dotc/transform/TreeTransform.scala | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/dotty/tools/dotc/transform/TreeTransform.scala b/src/dotty/tools/dotc/transform/TreeTransform.scala index 276080565..3869adf6c 100644 --- a/src/dotty/tools/dotc/transform/TreeTransform.scala +++ b/src/dotty/tools/dotc/transform/TreeTransform.scala @@ -184,38 +184,13 @@ object TreeTransforms { ref match { case ref: SymDenotation => val annotTrees = ref.annotations.map(_.tree) - val annotTrees1 = annotTrees.mapConserve(annotationTransformer.transform) + val annotTrees1 = annotTrees.mapConserve(annotationTransformer.macroTransform) val annots1 = if(annotTrees eq annotTrees1) ref.annotations else annotTrees1.map(new ConcreteAnnotation(_)) if ((info1 eq ref.info) && (annots1 eq ref.annotations)) ref else ref.copySymDenotation(info = info1, annotations = annots1) case _ => if (info1 eq ref.info) ref else ref.derivedSingleDenotation(ref.symbol, info1) } } - - def transformAnnotations(tree: MemberDef)(implicit ctx: Context): MemberDef ={ - val newAnnots = tree.mods.annotations.mapConserve(annotationTransformer.transform) - if (newAnnots eq tree.mods.annotations) tree - else { - val mods = tree.mods.copy(annotations = newAnnots) - tree match { - case t: DefDef => cpy.DefDef(t)(mods = mods) - case t: ValDef => cpy.ValDef(t)(mods = mods) - case t: TypeDef => cpy.TypeDef(t)(mods = mods) - } - } - } - - override def transformDefDef(tree: DefDef)(implicit ctx: Context, info: TransformerInfo): Tree = { - transformAnnotations(tree) - } - - override def transformTypeDef(tree: TypeDef)(implicit ctx: Context, info: TransformerInfo): Tree = { - transformAnnotations(tree) - } - - override def transformValDef(tree: tpd.ValDef)(implicit ctx: Context, info: TransformerInfo): tpd.Tree = { - transformAnnotations(tree) - } } val NoTransform = new TreeTransform { |