diff options
author | Martin Odersky <odersky@gmail.com> | 2013-04-09 11:38:10 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2013-04-09 11:38:10 +0200 |
commit | 9b42bdc7be28737be574980fea0af50e35f31a81 (patch) | |
tree | 49a3e17a5dd4d9f413a5449c9af99a1c227375cd /src/dotty/tools | |
parent | 31a4611cb0a13d05068c93406d2f8c1be31d45e2 (diff) | |
download | dotty-9b42bdc7be28737be574980fea0af50e35f31a81.tar.gz dotty-9b42bdc7be28737be574980fea0af50e35f31a81.tar.bz2 dotty-9b42bdc7be28737be574980fea0af50e35f31a81.zip |
Fixes to originalName and allOverrddenSymbols.
Diffstat (limited to 'src/dotty/tools')
-rw-r--r-- | src/dotty/tools/dotc/core/SymDenotations.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala index 6fca0a309..65a728778 100644 --- a/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/src/dotty/tools/dotc/core/SymDenotations.scala @@ -1,7 +1,7 @@ package dotty.tools.dotc package core -import Periods._, Contexts._, Symbols._, Denotations._, Names._, Annotations._ +import Periods._, Contexts._, Symbols._, Denotations._, Names._, NameOps._, Annotations._ import Types._, Flags._, Decorators._, Transformers._, StdNames._, Scopes._ import NameOps._ import Scopes.Scope @@ -167,8 +167,10 @@ object SymDenotations { // ------ Names ---------------------------------------------- /** The name with which the denoting symbol was created */ - final def originalName = - if (this is ExpandedName) initial.asSymDenotation.name else name + final def originalName = { + val d = initial.asSymDenotation + if (d is ExpandedName) d.name.unexpandedName() else d.name + } /** The encoded full path name of this denotation, where outer names and inner names * are separated by `separator` characters. @@ -534,7 +536,7 @@ object SymDenotations { /** All symbols overriden by this denotation. */ final def allOverriddenSymbols(implicit ctx: Context): Iterator[Symbol] = - info.baseClasses.tail.iterator map overriddenSymbol filter (_.exists) + owner.info.baseClasses.tail.iterator map overriddenSymbol filter (_.exists) /** The class or term symbol up to which this symbol is accessible, * or RootClass if it is public. As java protected statics are |