summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-04-21 17:21:28 +0000
committerMartin Odersky <odersky@gmail.com>2011-04-21 17:21:28 +0000
commit7c456cde62f3eb8ad4de21463d4df316c040d52f (patch)
tree40d1a255a688bfc23ca9a0e776925fa10a92e910 /src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
parent9388a634f5937d2ac626a884df9d7957a18ccbdc (diff)
downloadscala-7c456cde62f3eb8ad4de21463d4df316c040d52f.tar.gz
scala-7c456cde62f3eb8ad4de21463d4df316c040d52f.tar.bz2
scala-7c456cde62f3eb8ad4de21463d4df316c040d52f.zip
Added bridge method capability to compiler.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index 240f0c5f12..280d1b6019 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -184,7 +184,12 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
curTree = tree
val body1 = atOwner(currentOwner) { transformTrees(body) }
accDefs = accDefs.tail;
- treeCopy.Template(tree, parents, self, ownAccDefs.toList ::: body1);
+ treeCopy.Template(tree, parents, self, ownAccDefs.toList ::: body1)
+
+ case DefDef(_, _, _, _, _, _) if sym.hasAnnotation(definitions.BridgeClass) =>
+ sym.setFlag(BRIDGE)
+ sym.removeAnnotation(definitions.BridgeClass)
+ super.transform(tree)
case TypeApply(sel @ Select(This(_), name), args) =>
mayNeedProtectedAccessor(sel, args, false)