aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2016-01-23 22:22:58 +0100
committerGuillaume Martres <smarter@ubuntu.com>2016-01-23 22:22:58 +0100
commit8ceaba796346d40a1be156d38b02de91854634cd (patch)
tree9d5eef45ba965a8e8e709bd1524ea239ab6da71b /tests
parentab1d30d7d430eb472a97dcdd0af81e4cb3cfabb4 (diff)
parent2042adc79cff35cdafef4130b74ed90d0d5841bf (diff)
downloaddotty-8ceaba796346d40a1be156d38b02de91854634cd.tar.gz
dotty-8ceaba796346d40a1be156d38b02de91854634cd.tar.bz2
dotty-8ceaba796346d40a1be156d38b02de91854634cd.zip
Merge pull request #1038 from dotty-staging/fix-#1037
Fix #1037
Diffstat (limited to 'tests')
-rw-r--r--tests/run/t7475b.check2
-rw-r--r--tests/run/t7475b.scala5
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/run/t7475b.check b/tests/run/t7475b.check
index 51993f072..487b11653 100644
--- a/tests/run/t7475b.check
+++ b/tests/run/t7475b.check
@@ -1,2 +1,4 @@
2
2
+2
+2
diff --git a/tests/run/t7475b.scala b/tests/run/t7475b.scala
index a205602b6..d3b0435b0 100644
--- a/tests/run/t7475b.scala
+++ b/tests/run/t7475b.scala
@@ -1,11 +1,16 @@
trait A { private val x = 1 }
trait B { val x = 2 }
+trait C { val x: Int }
trait C1 extends B with A { println(x) }
trait C2 extends A with B { println(x) }
+trait C3 extends C with B { println(x) }
+trait C4 extends B with C { println(x) }
object Test {
def main(args: Array[String]): Unit = {
new C1 { }
new C2 { }
+ new C3 { }
+ new C4 { }
}
}