summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-10-16 10:59:52 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-10-16 10:59:52 -0700
commit87c5895d4bae62f1b5bacbd145f2e0fddcccf423 (patch)
tree2c5c23a6e6299d667856920857492c7f3ed59e45 /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parentb9aff6d5e419d3d77681b953036586d59eda1d7b (diff)
parent5b87e21b7ae100b6a217be3aed1aa1f9a6c404ce (diff)
downloadscala-87c5895d4bae62f1b5bacbd145f2e0fddcccf423.tar.gz
scala-87c5895d4bae62f1b5bacbd145f2e0fddcccf423.tar.bz2
scala-87c5895d4bae62f1b5bacbd145f2e0fddcccf423.zip
Merge pull request #1505 from paulp/merge-210-wip-210
Merge 2.10.0-wip into 2.10.x.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 5a9920c9e3..f82786da35 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1420,6 +1420,9 @@ trait Typers extends Modes with Adaptations with Tags {
case x: ValDef if x.mods.isLazy =>
//see https://issues.scala-lang.org/browse/SI-6358
implRestriction(tree, "lazy val")
+ case Select(sup @ Super(qual, mix), selector) if selector != nme.CONSTRUCTOR && qual.symbol == clazz && mix != tpnme.EMPTY =>
+ //see https://issues.scala-lang.org/browse/SI-6483
+ implRestriction(sup, "qualified super reference")
case _ =>
}
super.traverse(tree)