diff options
| author | Paul Phillips <paulp@improving.org> | 2013-03-28 21:37:39 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-03-28 21:38:30 -0700 |
| commit | 5ddad9257162b47526ac1df9cc39c056b206377e (patch) | |
| tree | d0e4a3f61a8aa78e6e46559fb3c874d0b5a86494 /src/reflect | |
| parent | df103faa5d5251d34a99a04f8d8b2b2786e6d3ab (diff) | |
| parent | 395e90a786874ebe795e656f532b50110c8c1a98 (diff) | |
| download | scala-5ddad9257162b47526ac1df9cc39c056b206377e.tar.gz scala-5ddad9257162b47526ac1df9cc39c056b206377e.tar.bz2 scala-5ddad9257162b47526ac1df9cc39c056b206377e.zip | |
Merge commit '395e90a786' into pr/merge-395e90a786
* commit '395e90a786':
SI-7251, compiler crash with $.
SI-7240 fixes language feature lookup
SI-7233 Account for aliased imports in Erasure
SI-7233 Account for aliased imports in eta expansion.
SI-7132 - don't discard Unit type in interpreter
SI-6725 `f` interpolator now supports %n tokens
Conflicts:
src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala
src/repl/scala/tools/nsc/interpreter/ExprTyper.scala
Diffstat (limited to 'src/reflect')
| -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 db6f05294b..5392daf674 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -973,7 +973,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 547fcdcfa7..037d44c540 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -3063,7 +3063,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 } |