summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-03-08 17:30:05 +0100
committerJason Zaugg <jzaugg@gmail.com>2014-03-08 17:30:05 +0100
commit973f2255481c0ee3c9954d361ef3941186495c8f (patch)
tree970f946780fd7633f6c08f6f9fa52b7c555c6b6d /test/files
parent6feaba678519dd4ff32d816e8c2c71989df1ceca (diff)
parent10154cf27d4e8f9f9be5411fb6bfb9b8fbe62ebc (diff)
downloadscala-973f2255481c0ee3c9954d361ef3941186495c8f.tar.gz
scala-973f2255481c0ee3c9954d361ef3941186495c8f.tar.bz2
scala-973f2255481c0ee3c9954d361ef3941186495c8f.zip
Merge pull request #3610 from xeno-by/ticket/8369
SI-8369 resetAttrs now correctly accounts for skolems
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/t8369a.check0
-rw-r--r--test/files/pos/t8369a.scala5
-rw-r--r--test/files/pos/t8369b.check0
-rw-r--r--test/files/pos/t8369b.scala18
4 files changed, 23 insertions, 0 deletions
diff --git a/test/files/pos/t8369a.check b/test/files/pos/t8369a.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/files/pos/t8369a.check
diff --git a/test/files/pos/t8369a.scala b/test/files/pos/t8369a.scala
new file mode 100644
index 0000000000..0596fdaf74
--- /dev/null
+++ b/test/files/pos/t8369a.scala
@@ -0,0 +1,5 @@
+object Bug {
+ trait Sys[S]
+ def test[S <: Sys[S]] = read[S]()
+ def read[S <: Sys[S]](baz: Any = 0): Some[S] = ???
+} \ No newline at end of file
diff --git a/test/files/pos/t8369b.check b/test/files/pos/t8369b.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/files/pos/t8369b.check
diff --git a/test/files/pos/t8369b.scala b/test/files/pos/t8369b.scala
new file mode 100644
index 0000000000..8145911db1
--- /dev/null
+++ b/test/files/pos/t8369b.scala
@@ -0,0 +1,18 @@
+object Bug {
+ trait Sys[S] {
+ type Tx
+ }
+
+ trait Baz[-Tx]
+
+ trait Foo[S <: Sys[S]] {
+ def bar: Bar[S] = Bar.read[S]()
+ }
+
+ object Bar {
+ object NoBaz extends Baz[Any]
+
+ def read[S <: Sys[S]](baz: Baz[S#Tx] = NoBaz): Bar[S] = ???
+ }
+ trait Bar[S <: Sys[S]]
+} \ No newline at end of file