summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-09-05 15:02:03 +1000
committerJason Zaugg <jzaugg@gmail.com>2014-09-05 15:02:03 +1000
commit87ca181e7b6874cce734a4a40f90fe4af2391d97 (patch)
treea3b9c1822365984c644015b8ab4f7abca0a8b803 /src/reflect
parent9753f23f9362b25a9f481b11dd8d51187187882a (diff)
parentf324ca5e14d29f8b4f6f7bbacc1c17f4233cd260 (diff)
downloadscala-87ca181e7b6874cce734a4a40f90fe4af2391d97.tar.gz
scala-87ca181e7b6874cce734a4a40f90fe4af2391d97.tar.bz2
scala-87ca181e7b6874cce734a4a40f90fe4af2391d97.zip
Merge pull request #3935 from lrytz/t8803
SI-8803 generate super accessor for super[A], if A is outer superclass
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/StdNames.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala
index 6848c357c5..d203218c09 100644
--- a/src/reflect/scala/reflect/internal/StdNames.scala
+++ b/src/reflect/scala/reflect/internal/StdNames.scala
@@ -473,7 +473,7 @@ trait StdNames {
)
def localDummyName(clazz: Symbol): TermName = newTermName(LOCALDUMMY_PREFIX + clazz.name + ">")
- def superName(name: Name): TermName = newTermName(SUPER_PREFIX_STRING + name)
+ def superName(name: Name, mix: Name = EMPTY): TermName = newTermName(SUPER_PREFIX_STRING + name + (if (mix.isEmpty) "" else "$" + mix))
/** The name of an accessor for protected symbols. */
def protName(name: Name): TermName = newTermName(PROTECTED_PREFIX + name)