diff options
| author | James Iry <jamesiry@gmail.com> | 2013-02-07 16:21:20 -0800 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-02-07 16:21:20 -0800 |
| commit | 4d618dca20cad709fd3f4b2346374e1c54501e01 (patch) | |
| tree | ee9ae1248ef92d02a6a922148445df61f860ef42 /src | |
| parent | 033c6635b4ac03b9e6f335a76dabb65f1f0296cd (diff) | |
| parent | b579a42ee3c079e9acf53b74085ae01ac6c35f0f (diff) | |
| download | scala-4d618dca20cad709fd3f4b2346374e1c54501e01.tar.gz scala-4d618dca20cad709fd3f4b2346374e1c54501e01.tar.bz2 scala-4d618dca20cad709fd3f4b2346374e1c54501e01.zip | |
Merge pull request #2069 from retronym/ticket/6888
SI-6888 Loosen criteria for $outer search.
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 72ad84edec..4ffd198dc4 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -2515,7 +2515,9 @@ trait Symbols extends api.Symbols { self: SymbolTable => } override def outerSource: Symbol = - if (originalName == nme.OUTER) initialize.referenced + // SI-6888 Approximate the name to workaround the deficiencies in `nme.originalName` + // in the face of clases named '$'. SI-2806 remains open to address the deeper problem. + if (originalName endsWith (nme.OUTER)) initialize.referenced else NoSymbol def setModuleClass(clazz: Symbol): TermSymbol = { |