diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-11-17 12:13:20 +0100 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-11-17 12:13:20 +0100 |
| commit | ebf16c7ef273206223674b3c72cd7a24a14bfa65 (patch) | |
| tree | b16343c7250e679f4ac1dca72e957a4055a3ef94 /test | |
| parent | e9a37521c499788fa7e1aab9d553c84ca00d8a4f (diff) | |
| parent | 5f50e0368e635db8279797095dbd34470722d5c7 (diff) | |
| download | scala-ebf16c7ef273206223674b3c72cd7a24a14bfa65.tar.gz scala-ebf16c7ef273206223674b3c72cd7a24a14bfa65.tar.bz2 scala-ebf16c7ef273206223674b3c72cd7a24a14bfa65.zip | |
Merge pull request #4114 from retronym/ticket/8534
SI-8534 Avoid crash in erroneous SelectFromTypeTree
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/t8534.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t8534.scala | 7 | ||||
| -rw-r--r-- | test/files/neg/t8534b.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t8534b.scala | 4 | ||||
| -rw-r--r-- | test/files/neg/t963.check | 8 |
5 files changed, 23 insertions, 4 deletions
diff --git a/test/files/neg/t8534.check b/test/files/neg/t8534.check new file mode 100644 index 0000000000..297e7c1beb --- /dev/null +++ b/test/files/neg/t8534.check @@ -0,0 +1,4 @@ +t8534.scala:6: error: MyTrait is not an enclosing class + class BugTest {def isTheBugHere(in: MyTrait.this.type#SomeData) = false} + ^ +one error found diff --git a/test/files/neg/t8534.scala b/test/files/neg/t8534.scala new file mode 100644 index 0000000000..f118d22b82 --- /dev/null +++ b/test/files/neg/t8534.scala @@ -0,0 +1,7 @@ +object line1 { + trait MyTrait +} +object line2 { + import line2._ + class BugTest {def isTheBugHere(in: MyTrait.this.type#SomeData) = false} +} diff --git a/test/files/neg/t8534b.check b/test/files/neg/t8534b.check new file mode 100644 index 0000000000..39ffa41194 --- /dev/null +++ b/test/files/neg/t8534b.check @@ -0,0 +1,4 @@ +t8534b.scala:3: error: stable identifier required, but foo.type found. + type T = foo.type#Foo + ^ +one error found diff --git a/test/files/neg/t8534b.scala b/test/files/neg/t8534b.scala new file mode 100644 index 0000000000..73b6703a9c --- /dev/null +++ b/test/files/neg/t8534b.scala @@ -0,0 +1,4 @@ +object Test { + def foo = "" + type T = foo.type#Foo +} diff --git a/test/files/neg/t963.check b/test/files/neg/t963.check index 4dc202c7bd..483e53c77d 100644 --- a/test/files/neg/t963.check +++ b/test/files/neg/t963.check @@ -1,9 +1,9 @@ -t963.scala:14: error: stable identifier required, but Test.this.y3.x found. +t963.scala:14: error: stable identifier required, but y3.x.type found. val w3 : y3.x.type = y3.x - ^ -t963.scala:17: error: stable identifier required, but Test.this.y4.x found. + ^ +t963.scala:17: error: stable identifier required, but y4.x.type found. val w4 : y4.x.type = y4.x - ^ + ^ t963.scala:10: error: type mismatch; found : AnyRef{def x: Integer} required: AnyRef{val x: Integer} |