diff options
| author | Paul Phillips <paulp@improving.org> | 2013-03-12 19:16:23 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-03-12 19:16:23 -0700 |
| commit | b7b4f877326acd6a8a24ff60fa1638cc18143c45 (patch) | |
| tree | 2695f167af5f522977b285bbb4bfc5a39c432539 /src | |
| parent | 7d0cb1f0e2c254ccc071fcd8a057c67065682a0f (diff) | |
| parent | a4fb77332cf641b023b46af5533b6007948b766e (diff) | |
| download | scala-b7b4f877326acd6a8a24ff60fa1638cc18143c45.tar.gz scala-b7b4f877326acd6a8a24ff60fa1638cc18143c45.tar.bz2 scala-b7b4f877326acd6a8a24ff60fa1638cc18143c45.zip | |
Merge pull request #2234 from scalamacros/ticket/7240
SI-7240 fixes language feature lookup
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Definitions.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index 6e4ca76382..e5d9e54a16 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -1046,7 +1046,7 @@ trait Definitions extends api.StandardDefinitions { getMemberIfDefined(owner, name) orElse { if (phase.flatClasses && name.isTypeName && !owner.isPackageObjectOrClass) { val pkg = owner.owner - val flatname = nme.flattenedName(owner.name, name) + val flatname = tpnme.flattenedName(owner.name, name) getMember(pkg, flatname) } else fatalMissingSymbol(owner, name) diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index d9eb48ff2d..45c16b7302 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -3022,7 +3022,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => if (Statistics.canEnable) Statistics.incCounter(nameCount) if (needsFlatClasses) { if (flatname eq null) - flatname = nme.flattenedName(rawowner.name, rawname).toTypeName + flatname = tpnme.flattenedName(rawowner.name, rawname) flatname } |