summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-04 13:03:30 -0700
committerPaul Phillips <paulp@improving.org>2012-09-04 13:03:30 -0700
commit9556dfbf9dbb1b129b5eaab577d90cf09206ed4d (patch)
tree609972662b7c0178f8090c42b770d0c032effdb6 /src
parentd34e8abaacf7a51e05630557681e8267d7050e3a (diff)
parent3415436b67ae7889a11ce2537576ca49b328aecc (diff)
downloadscala-9556dfbf9dbb1b129b5eaab577d90cf09206ed4d.tar.gz
scala-9556dfbf9dbb1b129b5eaab577d90cf09206ed4d.tar.bz2
scala-9556dfbf9dbb1b129b5eaab577d90cf09206ed4d.zip
Merge pull request #1251 from dragos/issue/fix-5064
Fixed positions in de-aliased special symbols..
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 34cb0fa59c..9cf5d42e00 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -579,7 +579,7 @@ trait Typers extends Modes with Adaptations with Tags {
// to notice exhaustiveness and to generate good code when
// List extractors are mixed with :: patterns. See Test5 in lists.scala.
def dealias(sym: Symbol) =
- (atPos(tree.pos) {gen.mkAttributedRef(sym)}, sym.owner.thisType)
+ (atPos(tree.pos.makeTransparent) {gen.mkAttributedRef(sym)} setPos tree.pos, sym.owner.thisType)
sym.name match {
case nme.List => return dealias(ListModule)
case nme.Seq => return dealias(SeqModule)
@@ -1057,7 +1057,7 @@ trait Typers extends Modes with Adaptations with Tags {
case other =>
other
}
- typed(atPos(tree.pos)(Select(qual, nme.apply)), mode, pt)
+ typed(atPos(tree.pos)(Select(qual setPos tree.pos.makeTransparent, nme.apply)), mode, pt)
}
// begin adapt